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
|
diff --git a/configure.ac b/configure.ac
index 6b75a34..5e932b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,6 +228,11 @@ AX_NORMALIZE_PATH([config_datadir],['/'])
AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
AC_SUBST(DATA_DIR, "$config_datadir")
+AX_RECURSIVE_EVAL([[$]docdir], [config_docdir])
+AX_NORMALIZE_PATH([config_docdir],['/'])
+AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir])
+AC_SUBST(DOC_DIR, "$config_docdir")
+
SING_SHOW_FLAGS([Compiler/linker flags: ])
diff --git a/resources/configure.ac b/resources/configure.ac
index bde2baa..9f9c966 100644
--- a/resources/configure.ac
+++ b/resources/configure.ac
@@ -72,5 +72,9 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
AX_NORMALIZE_PATH([config_datadir],['/'])
AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
+AX_RECURSIVE_EVAL([[$]htmldir], [config_htmldir])
+AX_NORMALIZE_PATH([config_htmldir],['/'])
+AC_DEFINE_UNQUOTED([HTML_DIR],"$config_datadir",[htmldir])
+
AC_CONFIG_FILES([singular_resources.pc Makefile])
AC_OUTPUT
diff --git a/resources/feResource.cc b/resources/feResource.cc
index 0eaa6fa..3309386 100644
--- a/resources/feResource.cc
+++ b/resources/feResource.cc
@@ -78,7 +78,7 @@ VAR feResourceConfig_s feResourceConfigs[] =
{"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", "%D/singular/html", (char *)""},
+ {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", 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 *)""},
|
GitWeb
