summaryrefslogtreecommitdiff
path: root/source3/configure.in
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-12-09 21:31:38 +0000
committerGerald Carter <jerry@samba.org>2003-12-09 21:31:38 +0000
commit272be24ffd94f81c273775e154f01d93028d4b28 (patch)
treea7e9bf6e88d59808cc394dada79db7ac987d2d5f /source3/configure.in
parentea4e53904ed015a754b5151fdd705fbab1630750 (diff)
downloadsamba-272be24ffd94f81c273775e154f01d93028d4b28.tar.gz
samba-272be24ffd94f81c273775e154f01d93028d4b28.tar.bz2
samba-272be24ffd94f81c273775e154f01d93028d4b28.zip
working on packaging; also fixed some path issues in configure.in & Makefile.in
(This used to be commit c16e51bfaf59b2d5b1b800ee272ac45b13b9a9fc)
Diffstat (limited to 'source3/configure.in')
-rw-r--r--source3/configure.in24
1 files changed, 22 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 5c4580f14a..b5b5a7609f 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)