From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 27 Dec 2006 00:36:03 +0000 (+0000)
Subject: r20351: ensure these variables are set in the right place in the Makefile
X-Git-Url: http://git.samba.org/samba.git/?p=jra%2Fsamba%2F.git;a=commitdiff_plain;h=b4ae9868d0657c4380ebac376b0a11b1f85f5321

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 0bdea20f941..abbe5077a0c 100644
--- 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 3efdaf0987a..2c15cf89124 100644
--- 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