summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElrond <elrond@samba.org>2000-04-07 18:26:58 +0000
committerElrond <elrond@samba.org>2000-04-07 18:26:58 +0000
commit3804d7b5cc76d08af88c326bb120b069432e975e (patch)
treebae94c0b41d23ca204a1daa43280fbbf33bb3a5e
parent1ecfffb3feb87be52e3762f3c44652e8152da81e (diff)
downloadsamba-3804d7b5cc76d08af88c326bb120b069432e975e.tar.gz
using sambaconfdir for smb.conf and lmhosts.
Which other files in ${LIBDIR} are config-files?
-rw-r--r--source/Makefile.in11
1 files changed, 7 insertions, 4 deletions
diff --git a/source/Makefile.in b/source/Makefile.in
index 94868619b81..cf185ce8aff 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -14,6 +14,7 @@ CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
LDFLAGS=@LDFLAGS@
AWK=@AWK@
+
LIBTOOL=@LIBTOOL@ --quiet
LIBTOOL_DEPS=@LIBTOOL_DEPS@
LINK=$(LIBTOOL) --mode=link $(CC) $(FLAGS) $(LDFLAGS)
@@ -39,7 +40,8 @@ SBINDIR = @sbindir@
LIBDIR = @libdir@
VARDIR = @localstatedir@
MANDIR = @mandir@
-SYSCONFDIR = @sysconfdir@
+sysconfdir = @sysconfdir@
+sambaconfdir = @sambaconfdir@
# The permissions to give the executables
INSTALLPERMS = 0755
@@ -50,12 +52,13 @@ INSTALLPERMS = 0755
LOGFILEBASE = $(VARDIR)
SMBLOGFILE = $(LOGFILEBASE)/log.smb
NMBLOGFILE = $(LOGFILEBASE)/log.nmb
-CONFIGFILE = $(LIBDIR)/smb.conf
-LMHOSTSFILE = $(LIBDIR)/lmhosts
+CONFIGFILE = $(sambaconfdir)/smb.conf
+LMHOSTSFILE = $(sambaconfdir)/lmhosts
DRIVERFILE = $(LIBDIR)/printers.def
FORMSFILE = $(LIBDIR)/ntforms.def
NTDRIVERSDIR = $(LIBDIR)
PASSWD_PROGRAM = /bin/passwd
+# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
@@ -119,7 +122,7 @@ PROGS4 = @WRAP@ @WRAP32@
#MPROGS = @MPROGS@
PROGS = $(PROGS1) $(PROGS2) $(PROGS3) $(PROGS4) $(MPROGS) bin/nmblookup bin/make_printerdef
-SCRIPTS = script/smbtar script/addtosmbpass script/convert_smbpasswd
+SCRIPTS = $(srcdir)/script/smbtar $(srcdir)/script/addtosmbpass $(srcdir)/script/convert_smbpasswd
QUOTAOBJS=@QUOTAOBJS@