svn commit: samba r13158 - in branches/SAMBA_4_0/source: . include param

[jelmer at samba.org]

Author: jelmer
Date: 2006-01-26 10:18:26 +0000 (Thu, 26 Jan 2006)
New Revision: 13158

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13158

Log:
Fix setup and ejs paths

Modified:
   branches/SAMBA_4_0/source/dynconfig.c
   branches/SAMBA_4_0/source/include/dynconfig.h
   branches/SAMBA_4_0/source/main.mk
   branches/SAMBA_4_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_4_0/source/dynconfig.c
===================================================================
--- branches/SAMBA_4_0/source/dynconfig.c	2006-01-26 08:27:48 UTC (rev 13157)
+++ branches/SAMBA_4_0/source/dynconfig.c	2006-01-26 10:18:26 UTC (rev 13158)
@@ -79,3 +79,7 @@
 
 /** SWAT data file (images, etc) directory */
 const char *dyn_SWATDIR = SWATDIR;
+
+const char *dyn_SETUPDIR = SETUPDIR;
+
+const char *dyn_JSDIR = JSDIR;

Modified: branches/SAMBA_4_0/source/include/dynconfig.h
===================================================================
--- branches/SAMBA_4_0/source/include/dynconfig.h	2006-01-26 08:27:48 UTC (rev 13157)
+++ branches/SAMBA_4_0/source/include/dynconfig.h	2006-01-26 10:18:26 UTC (rev 13158)
@@ -38,3 +38,5 @@
 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;

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-01-26 08:27:48 UTC (rev 13157)
+++ branches/SAMBA_4_0/source/main.mk	2006-01-26 10:18:26 UTC (rev 13158)
@@ -83,7 +83,8 @@
 	 -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 @@
 		$(DESTDIR)$(LOGFILEBASE) \
 		$(DESTDIR)$(PRIVATEDIR)/tls \
 		$(DESTDIR)$(INCLUDEDIR) \
-		$(DESTDIR)$(PKGCONFIGDIR)
+		$(DESTDIR)$(PKGCONFIGDIR) \
+		$(DESTDIR)$(CONFIGDIR) \
 
 installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs
 	@$(SHELL) $(srcdir)/script/installbin.sh \

Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2006-01-26 08:27:48 UTC (rev 13157)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2006-01-26 10:18:26 UTC (rev 13158)
@@ -694,8 +694,8 @@
 	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)) {