1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
Description: debianization - resources
Address Debian Policy requirements for Singular resources.
Origin: vendor, Debian
Forwarded: not-needed
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2024-06-29
--- a/factory/Makefile.am
+++ b/factory/Makefile.am
@@ -206,7 +206,7 @@
####################################################
# the precomputed GF(q)-tables
-gftablesdir=$(datadir)/factory/gftables
+gftablesdir=$(datadir)/singular/factory/gftables
dist_gftables_DATA = gftables/10201 gftables/1024 gftables/10609 gftables/11449 \
gftables/11881 gftables/121 gftables/12167 gftables/125 gftables/12769 \
gftables/128 gftables/1331 gftables/1369 gftables/14641 \
--- a/resources/feResource.cc
+++ b/resources/feResource.cc
@@ -46,36 +46,36 @@
"%r/share/singular/LIB;"
"%b/../share/singular/LIB;"
// gftables:
- "%D/factory;"
- "%r/share/factory;"
- "%b/LIB;"
- "%b/../LIB;" // not installed, shared is in .libs/Singular
- "%b/../factory;"
- "%b/../../factory;" // not installed, shared is in .libs/Singular
+ "%D/singular/factory;"
+ "%r/share/singular/factory;"
+ ////"%b/LIB;"
+ ////"%b/../LIB;" // not installed, shared is in .libs/Singular
+ "%b/../share/singular/factory;"
+ ////"%b/../../factory;" // not installed, shared is in .libs/Singular
// path for dynamic modules, should match ProcDir:
- "%b/MOD;"
- "%b/../MOD;" // Singular in .libs/Singular
+ ////"%b/MOD;"
+ ////"%b/../MOD;" // Singular in .libs/Singular
"%r/lib/singular/MOD;"
LIB_DIR "/singular/MOD;"
"%b;"
- "%b/..", // Singular in .libs/Singular
- (char *)""},
+ ///"%b/..", // Singular in .libs/Singular
+ ,(char *)""},
{"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/Singular", (char *)""},
{"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "", (char *)""},
// should be changed to %b/../lib/singular/pProcs/:
{"ProcDir", 'P', feResPath, "SINGULAR_PROCS_DIR",
"%b/MOD;"
- "%b/../MOD;" // Singular in .libs/Singular
- "%b/..;" // Singular in .libs/Singular, programs in .
+ ////"%b/../MOD;" // Singular in .libs/Singular
+ ////"%b/..;" // Singular in .libs/Singular, programs in .
"%r/lib/singular/MOD;"
- LIB_DIR "/singular/MOD;" /*debian: -> /usr/lib/singular/MOD */
+ LIB_DIR "/singular/MOD;"
,(char *)""},
{"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%b/..", (char *)""},
{"DataDir", 'D', feResDir, "SINGULAR_DATA_DIR", "%b/../share/", (char *)""},
{"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, (char *)""},
{"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%D/info/singular.info", (char *)""},
{"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%D/singular/singular.idx", (char *)""},
- {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", DATA_TO_HTML_DIR, (char *)""},
+ {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", DATA_TO_HTML_DIR, (char *)""},
{"ManualUrl", 'u', feResUrl, "SINGULAR_URL", "https://www.singular.uni-kl.de/Manual/", (char *)""},
{"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/examples", (char *)""},
{"Path", 'p', feResPath, NULL, "%b;%P;$PATH", (char *)""},
--- a/resources/configure.ac
+++ b/resources/configure.ac
@@ -76,7 +76,7 @@
AX_RECURSIVE_EVAL([[$]htmldir], [config_htmldir])
AX_NORMALIZE_PATH([config_htmldir],['/'])
AX_COMPUTE_RELATIVE_PATHS([config_datadir:config_htmldir:data_to_html])
-AC_DEFINE_UNQUOTED([DATA_TO_HTML_DIR],"%D/$data_to_html",[htmldir])
+AC_DEFINE_UNQUOTED([DATA_TO_HTML_DIR],"%D/$data_to_html/html",[htmldir])
AC_CONFIG_FILES([singular_resources.pc Makefile])
AC_OUTPUT
|
