summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-01-26 10:18:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:30 -0500
commit8adec6d36373e89c0037105c0867fe6776c45449 (patch)
tree20bf646855b7ddc2d7ed6e1bc71d0c8e70e27e3d /source4
parent57d079e4b2f5413a2ef0796b52dc5b5c34097a63 (diff)
downloadsamba-8adec6d36373e89c0037105c0867fe6776c45449.tar.gz
samba-8adec6d36373e89c0037105c0867fe6776c45449.tar.bz2
samba-8adec6d36373e89c0037105c0867fe6776c45449.zip
r13158: Fix setup and ejs paths
(This used to be commit c3bc39bd713e2a2b0a270d22e38fe39959a6a7c9)
Diffstat (limited to 'source4')
-rw-r--r--source4/dynconfig.c4
-rw-r--r--source4/include/dynconfig.h2
-rw-r--r--source4/main.mk6
-rw-r--r--source4/param/loadparm.c4
4 files changed, 12 insertions, 4 deletions
diff --git a/source4/dynconfig.c b/source4/dynconfig.c
index a098aa5086..70f17d0b48 100644
--- a/source4/dynconfig.c
+++ b/source4/dynconfig.c
@@ -79,3 +79,7 @@ const char *dyn_PRIVATE_DIR = PRIVATE_DIR;
/** SWAT data file (images, etc) directory */
const char *dyn_SWATDIR = SWATDIR;
+
+const char *dyn_SETUPDIR = SETUPDIR;
+
+const char *dyn_JSDIR = JSDIR;
diff --git a/source4/include/dynconfig.h b/source4/include/dynconfig.h
index 8135e53c0b..32f5a24f80 100644
--- a/source4/include/dynconfig.h
+++ b/source4/include/dynconfig.h
@@ -38,3 +38,5 @@ extern const char *dyn_PIDDIR;
extern const char *dyn_SMB_PASSWD_FILE;
extern const char *dyn_PRIVATE_DIR;
extern const char *dyn_SWATDIR;
+extern const char *dyn_JSDIR;
+extern const char *dyn_SETUPDIR;
diff --git a/source4/main.mk b/source4/main.mk
index a58729e73b..59dffb4841 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -83,7 +83,8 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" \
-DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
-DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
-DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
- -DMODULESDIR=\"$(MODULESDIR)\"
+ -DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \
+ -DSETUPDIR=\"$(SETUPDIR)\"
install: showlayout installbin installdat installswat installmisc installlib \
installheader installpc
@@ -109,7 +110,8 @@ installdirs:
$(DESTDIR)$(LOGFILEBASE) \
$(DESTDIR)$(PRIVATEDIR)/tls \
$(DESTDIR)$(INCLUDEDIR) \
- $(DESTDIR)$(PKGCONFIGDIR)
+ $(DESTDIR)$(PKGCONFIGDIR) \
+ $(DESTDIR)$(CONFIGDIR) \
installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs
@$(SHELL) $(srcdir)/script/installbin.sh \
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index ae0e4b3bf0..a92bc68371 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -694,8 +694,8 @@ static void init_globals(void)
do_parameter("tls keyfile", "tls/key.pem", NULL);
do_parameter("tls certfile", "tls/cert.pem", NULL);
do_parameter("tls cafile", "tls/ca.pem", NULL);
- do_parameter_var("js include", "%s/js", dyn_LIBDIR);
- do_parameter_var("setup directory", "%s/setup", dyn_LIBDIR);
+ do_parameter_var("js include", "%s", dyn_JSDIR);
+ do_parameter_var("setup directory", "%s", dyn_SETUPDIR);
for (i = 0; parm_table[i].label; i++) {
if (!(parm_table[i].flags & FLAG_CMDLINE)) {