svn commit: samba r20351 - in branches/SAMBA_4_0/source: .

[tridge at samba.org]

Author: tridge
Date: 2006-12-27 00:36:03 +0000 (Wed, 27 Dec 2006)
New Revision: 20351

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

Log:

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

Modified:
   branches/SAMBA_4_0/source/dynconfig.mk
   branches/SAMBA_4_0/source/main.mk


Changeset:
Modified: branches/SAMBA_4_0/source/dynconfig.mk
===================================================================
--- branches/SAMBA_4_0/source/dynconfig.mk	2006-12-25 19:39:36 UTC (rev 20350)
+++ branches/SAMBA_4_0/source/dynconfig.mk	2006-12-27 00:36:03 UTC (rev 20351)
@@ -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)\" \

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-12-25 19:39:36 UTC (rev 20350)
+++ branches/SAMBA_4_0/source/main.mk	2006-12-27 00:36:03 UTC (rev 20351)
@@ -84,13 +84,6 @@
 # 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