summaryrefslogtreecommitdiff
path: root/source3/Makefile.in
diff options
context:
space:
mode:
authorSteven Danneman <steven.danneman@isilon.com>2009-01-08 11:18:13 -0800
committerMichael Adam <obnox@samba.org>2009-01-12 12:16:03 +0100
commit19a05bf2f485023b11b41dfae3f6459847d55ef7 (patch)
tree74b17e9f203dd81926a09876dc78e7cae3e799f6 /source3/Makefile.in
parentffb53c35748154081c1587b5f167721e32ff10f2 (diff)
downloadsamba-19a05bf2f485023b11b41dfae3f6459847d55ef7.tar.gz
samba-19a05bf2f485023b11b41dfae3f6459847d55ef7.tar.bz2
samba-19a05bf2f485023b11b41dfae3f6459847d55ef7.zip
Make STATEDIR and CACHEDIR configurable through ./configure and loadparm.c
If they are not explicitely set in either place both will default to LOCKDIR. Signed-off-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r--source3/Makefile.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index a4b9bda564..08ba0ad32a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -147,7 +147,7 @@ LOCALEDIR= @localedir@
# the directory where lock files go
LOCKDIR = @lockdir@
-# FHS directories; equal to LOCKDIR if not using --with-fhs
+# FHS directories; equal to LOCKDIR if not using --with-fhs, but also settable
CACHEDIR = @cachedir@
STATEDIR = @statedir@
@@ -2641,7 +2641,10 @@ install-everything:: install installmodules
# is not used
installdirs::
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR) $(CODEPAGEDIR) $(MODULESDIR) $(LOCALEDIR)
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) \
+ $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) \
+ $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(STATEDIR) \
+ $(CACHEDIR) $(MANDIR) $(CODEPAGEDIR) $(MODULESDIR) $(LOCALEDIR)
installservers:: all installdirs
@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS)
@@ -2724,6 +2727,8 @@ showlayout::
@echo " privatedir: $(PRIVATE_DIR)"
@echo " configdir: $(CONFIGDIR)"
@echo " lockdir: $(LOCKDIR)"
+ @echo " statedir: $(STATEDIR)"
+ @echo " cachedir: $(CACHEDIR)"
@echo " piddir: $(PIDDIR)"
@echo " swatdir: $(SWATDIR)"
@echo " codepagedir: $(CODEPAGEDIR)"