[SCM] Samba Shared Repository - branch master updated - 1f8fe94ff3a928063c91ded4571751da74d2c321

[Volker Lendecke]

The branch, master has been updated
       via  1f8fe94ff3a928063c91ded4571751da74d2c321 (commit)
      from  5477e1cbf90e3814713653e86af5e1d14518bc9c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1f8fe94ff3a928063c91ded4571751da74d2c321
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 23 22:44:21 2008 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 source4/dynconfig/config.mk |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk
index b100183..c0ef7f6 100644
--- 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)\" \


-- 
Samba Shared Repository