diff options
| author | Gerald Carter <jerry@samba.org> | 2003-12-09 21:29:25 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-12-09 21:29:25 +0000 |
| commit | f2c6cec3395e66b33d067fec3d863477cb774a59 (patch) | |
| tree | d2ff0ed63af8442f6a6171dd92874a2f4929ee47 /source3 | |
| parent | 8d019a9682c6d6b42f296b7db5d3c342a5633b3b (diff) | |
| download | samba-f2c6cec3395e66b33d067fec3d863477cb774a59.tar.gz samba-f2c6cec3395e66b33d067fec3d863477cb774a59.tar.bz2 samba-f2c6cec3395e66b33d067fec3d863477cb774a59.zip | |
working on packaging; also fixed some path issues in configure.in & Makefile.in
(This used to be commit 8f6cd36fa03edf75e8e3a806ab178d8563dea081)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 17 | ||||
| -rw-r--r-- | source3/configure.in | 24 |
2 files changed, 32 insertions, 9 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index f64cd7be24..e1087b9eb5 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -9,7 +9,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -mandir=@mandir@ LIBS=@LIBS@ CC=@CC@ @@ -1293,12 +1292,16 @@ installman: installdirs showlayout: @echo "Samba will be installed into:" - @echo " basedir: $(BASEDIR)" - @echo " bindir: $(BINDIR)" - @echo " sbindir: $(SBINDIR)" - @echo " libdir: $(LIBDIR)" - @echo " vardir: $(VARDIR)" - @echo " mandir: $(MANDIR)" + @echo " basedir: $(BASEDIR)" + @echo " bindir: $(BINDIR)" + @echo " sbindir: $(SBINDIR)" + @echo " libdir: $(LIBDIR)" + @echo " vardir: $(VARDIR)" + @echo " mandir: $(MANDIR)" + @echo " privatedir: $(PRIVATE_DIR)" + @echo " configdir: $(CONFIGDIR)" + @echo " lockdir: $(LOCKDIR)" + @echo " piddir: $(PIDDIR)" uninstall: uninstallman uninstallbin uninstallscripts uninstallmodules diff --git a/source3/configure.in b/source3/configure.in index 174a48b87e..bf16194740 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -17,8 +17,9 @@ AC_PREFIX_DEFAULT(/usr/local/samba) AC_ARG_WITH(fhs, [ --with-fhs Use FHS-compliant paths (default=no)], configdir="${sysconfdir}/samba" - lockdir="\${VARDIR}/cache/samba" - piddir="\${VARDIR}/run/samba" + lockdir="\${VARDIR}/lib/samba" + piddir="\${VARDIR}/run" + mandir="\${prefix}/share/man" logfilebase="\${VARDIR}/log/samba" privatedir="\${CONFIGDIR}/private" libdir="\${prefix}/lib/samba" @@ -27,6 +28,7 @@ AC_ARG_WITH(fhs, logfilebase="\${VARDIR}" lockdir="\${VARDIR}/locks" piddir="\${VARDIR}/locks" + mandir="\${prefix}/man" privatedir="\${prefix}/private" swatdir="\${prefix}/swat") @@ -79,6 +81,23 @@ AC_ARG_WITH(piddir, esac]) ################################################# +# set pid directory location +AC_ARG_WITH(piddir, +[ --with-mandir=DIR Where to put man pages ($ac_default_prefix/man)], +[ case "$withval" in + yes|no) + # + # Just in case anybody calls it without argument + # + AC_MSG_WARN([--with-mandir called without argument - will use default]) + ;; + * ) + piddir="$withval" + ;; + esac]) + + +################################################# # set SWAT directory location AC_ARG_WITH(swatdir, [ --with-swatdir=DIR Where to put SWAT files ($ac_default_prefix/swat)], @@ -148,6 +167,7 @@ done AC_SUBST(configdir) AC_SUBST(lockdir) AC_SUBST(piddir) +AC_SUBST(mandir) AC_SUBST(logfilebase) AC_SUBST(privatedir) AC_SUBST(swatdir) |