summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-12-27 00:36:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:30:14 -0500
commitb4ae9868d0657c4380ebac376b0a11b1f85f5321 (patch)
tree5f6a98043440aeb45b7027b498ee8b34db9c4193
parente0b5d94e0ad5d29e7e92da1fb24dafde5d5d1250 (diff)
downloadsamba-b4ae9868d0657c4380ebac376b0a11b1f85f5321.tar.gz
samba-b4ae9868d0657c4380ebac376b0a11b1f85f5321.tar.bz2
samba-b4ae9868d0657c4380ebac376b0a11b1f85f5321.zip
r20351: ensure these variables are set in the right place in the Makefile
(This used to be commit 0ed2c0a0afea5b0d4c5f49e2493cb6eae694fe40)
-rw-r--r--source4/dynconfig.mk7
-rw-r--r--source4/main.mk7
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk
index 0bdea20f94..abbe5077a0 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 3efdaf0987..2c15cf8912 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