diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-05-26 02:06:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:02 -0500 |
| commit | 7e582319528b674d5f7603409e357138194a0ab1 (patch) | |
| tree | a5c3c63c60dde9e401f1978197722fabfc10f7a4 /source4/build | |
| parent | d70912a26af49db468af7ec88e9689b8176e0576 (diff) | |
| download | samba-7e582319528b674d5f7603409e357138194a0ab1.tar.gz samba-7e582319528b674d5f7603409e357138194a0ab1.tar.bz2 samba-7e582319528b674d5f7603409e357138194a0ab1.zip | |
r6982: install the swat pages with 'make installswat'
(This used to be commit 31543e1eae03d22343ea8c970494af36eb07b41f)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/check_path.m4 | 15 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 10 |
2 files changed, 23 insertions, 2 deletions
diff --git a/source4/build/smb_build/check_path.m4 b/source4/build/smb_build/check_path.m4 index bfd15d3d8c..5d3c70049d 100644 --- a/source4/build/smb_build/check_path.m4 +++ b/source4/build/smb_build/check_path.m4 @@ -107,6 +107,20 @@ AC_ARG_WITH(logfilebase, ;; esac]) + +################################################# +# set swat directory location +AC_ARG_WITH(swatdir, +[ --with-swatdir=DIR Where to put configuration files (\$swatdir)], +[ case "$withval" in + yes|no) + AC_MSG_WARN([--with-swatdir called without argument - will use default]) + ;; + * ) + swatdir="$withval" + ;; + esac]) + AC_SUBST(configdir) AC_SUBST(lockdir) AC_SUBST(piddir) @@ -114,6 +128,7 @@ AC_SUBST(logfilebase) AC_SUBST(privatedir) AC_SUBST(bindir) AC_SUBST(sbindir) +AC_SUBST(swatdir) debug=no AC_ARG_ENABLE(debug, diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 19ed201d81..ab64eff99c 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -41,6 +41,7 @@ SBINDIR = @sbindir@ LIBDIR = @libdir@ CONFIGDIR = @configdir@ VARDIR = @localstatedir@ +SWATDIR = @swatdir@ # The permissions to give the executables INSTALLPERMS = 0755 @@ -71,7 +72,8 @@ PATH_FLAGS4 = $(PATH_FLAGS3) -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \ -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\" PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" -PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS) +PATH_FLAGS7 = $(PATH_FLAGS6) -DSWATDIR=\"$(SWATDIR)\" +PATH_FLAGS = $(PATH_FLAGS7) $(PASSWD_FLAGS) __EOD__ @@ -622,6 +624,7 @@ showlayout: @echo " privatedir: $(PRIVATEDIR)" @echo " piddir: $(PIDDIR)" @echo " lockdir: $(LOCKDIR)" + @echo " swatdir: $(SWATDIR)" showflags: @echo "Samba will be compiled with flags:" @@ -655,7 +658,7 @@ REG_PROGS = bin/regpatch \ bin/regpatch \ bin/regdiff -install: showlayout installbin installtorture installldb installreg installdat +install: showlayout installbin installtorture installldb installreg installdat installswat # DESTDIR is used here to prevent packagers wasting their time # duplicating the Makefile. Remove it and you will have the privelege @@ -684,6 +687,9 @@ installreg: all installdirs installdat: installdirs @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(LIBDIR) $(srcdir) +installswat: installdirs + @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) + uninstall: uninstallbin uninstalltorture uninstallldb uninstallreg uninstallbin: |