S3 puts smb.conf and lmhosts in lib/, s4 into etc/

diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk
index b10018384ff1b8d595c74d7df796d70afd33027a..c0ef7f6e990224ed7088ba3be39c25a4661b2442 100644 (file)
--- a/source4/dynconfig/config.mk
+++ b/source4/dynconfig/config.mk
@@ -5,12 +5,12 @@ DYNCONFIG_OBJ_FILES = $(dynconfigsrcdir)/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 = $(sysconfdir)/smb.conf
+CONFIG4FILE = $(sysconfdir)/smb.conf
 PKGCONFIGDIR = $(libdir)/pkgconfig
-LMHOSTSFILE = $(sysconfdir)/lmhosts
+LMHOSTSFILE4 = $(sysconfdir)/lmhosts
 
-$(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(bindir)\" \
-        -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
+$(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIG4FILE)\" -DBINDIR=\"$(bindir)\" \
+        -DLMHOSTSFILE=\"$(LMHOSTSFILE4)\" \
         -DLOCKDIR=\"$(lockdir)\" -DPIDDIR=\"$(piddir)\" -DDATADIR=\"$(datadir)\" \
         -DLOGFILEBASE=\"$(logfilebase)\" \
         -DCONFIGDIR=\"$(sysconfdir)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \