summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-12-17 10:10:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:28 -0500
commit356eed3fe816c4058de5eda79d1087b8a54e62cc (patch)
tree22db34b39ee1aa92a87bcf55ac3717ebfc4947b4
parent358cfffaa2c6b4048667ffe05f1beddca54b6cc8 (diff)
downloadsamba-356eed3fe816c4058de5eda79d1087b8a54e62cc.tar.gz
samba-356eed3fe816c4058de5eda79d1087b8a54e62cc.tar.bz2
samba-356eed3fe816c4058de5eda79d1087b8a54e62cc.zip
r12302: - create the logfilebase directory with make install
- get rid of unreadable long lines metze (This used to be commit 98fa61714b61d8a725b1aca82f830fd0d24456d3)
-rw-r--r--source4/main.mk31
1 files changed, 28 insertions, 3 deletions
diff --git a/source4/main.mk b/source4/main.mk
index 96b365dbd2..9c06134f29 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -47,6 +47,7 @@ showlayout:
@echo " privatedir: $(PRIVATEDIR)"
@echo " piddir: $(PIDDIR)"
@echo " lockdir: $(LOCKDIR)"
+ @echo " logfilebase: $(LOGFILEBASE)"
@echo " swatdir: $(SWATDIR)"
@echo " mandir: $(MANDIR)"
@@ -87,11 +88,35 @@ install: showlayout installbin installdat installswat installmisc installlib \
# is not used.
installdirs:
- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(PRIVATEDIR)/tls $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(PKGCONFIGDIR)
+ @$(SHELL) $(srcdir)/script/installdirs.sh \
+ $(DESTDIR)$(BASEDIR) \
+ $(DESTDIR)$(BINDIR) \
+ $(DESTDIR)$(SBINDIR) \
+ $(DESTDIR)$(LIBDIR) \
+ $(DESTDIR)$(VARDIR) \
+ $(DESTDIR)$(PRIVATEDIR) \
+ $(DESTDIR)$(PIDDIR) \
+ $(DESTDIR)$(LOCKDIR) \
+ $(DESTDIR)$(LOGFILEBASE) \
+ $(DESTDIR)$(PRIVATEDIR)/tls \
+ $(DESTDIR)$(INCLUDEDIR) \
+ $(DESTDIR)$(PKGCONFIGDIR)
installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs
- @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS)
- @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(BIN_PROGS)
+ @$(SHELL) $(srcdir)/script/installbin.sh \
+ $(INSTALLPERMS) \
+ $(DESTDIR)$(BASEDIR) \
+ $(DESTDIR)$(SBINDIR) \
+ $(DESTDIR)$(LIBDIR) \
+ $(DESTDIR)$(VARDIR) \
+ $(SBIN_PROGS)
+ @$(SHELL) $(srcdir)/script/installbin.sh \
+ $(INSTALLPERMS) \
+ $(DESTDIR)$(BASEDIR) \
+ $(DESTDIR)$(BINDIR) \
+ $(DESTDIR)$(LIBDIR) \
+ $(DESTDIR)$(VARDIR) \
+ $(BIN_PROGS)
installlib: libraries installdirs
@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) $(SHARED_LIBS)