From 8adec6d36373e89c0037105c0867fe6776c45449 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 26 Jan 2006 10:18:26 +0000
Subject: r13158: Fix setup and ejs paths (This used to be commit
 c3bc39bd713e2a2b0a270d22e38fe39959a6a7c9)

---
 source4/dynconfig.c         | 4 ++++
 source4/include/dynconfig.h | 2 ++
 source4/main.mk             | 6 ++++--
 source4/param/loadparm.c    | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'source4')

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)) {
-- 
cgit