r20351: ensure these variables are set in the right place in the Makefile

(This used to be commit 0ed2c0a0afea5b0d4c5f49e2493cb6eae694fe40)

diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk
index 0bdea20f94191e4d963fbddb721b41c785021a6a..abbe5077a0cd5880693464422c866608c46f1418 100644 (file)
--- a/source4/dynconfig.mk
+++ b/source4/dynconfig.mk
@@ -1,6 +1,13 @@
 [SUBSYSTEM::DYNCONFIG]
 OBJ_FILES = dynconfig.o
 
+# set these to where to find various files
+# These can be overridden by command line switches (see smbd(8))
+# or in smb.conf (see smb.conf(5))
+CONFIGFILE = $(CONFIGDIR)/smb.conf
+PKGCONFIGDIR = $(LIBDIR)/pkgconfig
+LMHOSTSFILE = $(CONFIGDIR)/lmhosts
+
 PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \
         -DBINDIR=\"$(BINDIR)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
         -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(DATADIR)\" \

diff --git a/source4/main.mk b/source4/main.mk
index 3efdaf0987abc0a3cbe5bbdc0a68e8ffa3aaf721..2c15cf891243ac8b76d9f8848953132fe80cc6af 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -84,13 +84,6 @@ showflags:
 # The permissions to give the executables
 INSTALLPERMS = 0755
 
-# set these to where to find various files
-# These can be overridden by command line switches (see smbd(8))
-# or in smb.conf (see smb.conf(5))
-CONFIGFILE = $(CONFIGDIR)/smb.conf
-PKGCONFIGDIR = $(LIBDIR)/pkgconfig
-LMHOSTSFILE = $(CONFIGDIR)/lmhosts
-
 install: showlayout installbin installdat installswat installmisc installlib \
        installheader installpc installplugins