summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-01-26 05:57:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:29 -0500
commit2f8b1050e1e7b2f04b304156e9e4fa2828d23f94 (patch)
tree583347f0d1a81704266714134f6510858e475edd /source4
parentb2050691a751f4688098b4a747acd805e4776ba1 (diff)
downloadsamba-2f8b1050e1e7b2f04b304156e9e4fa2828d23f94.tar.gz
samba-2f8b1050e1e7b2f04b304156e9e4fa2828d23f94.tar.bz2
samba-2f8b1050e1e7b2f04b304156e9e4fa2828d23f94.zip
r13153: Try to move closer to FHS. This probably breaks everything...
Andrew Bartlett (This used to be commit 2c02a45d5a6c79ced7aea0f7e9d23fae19c2d127)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/m4/check_path.m457
-rw-r--r--source4/build/smb_build/makefile.pm6
-rw-r--r--source4/main.mk4
-rwxr-xr-xsource4/script/installmisc.sh17
4 files changed, 22 insertions, 62 deletions
diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4
index 789f445797..b45368ccd9 100644
--- a/source4/build/m4/check_path.m4
+++ b/source4/build/m4/check_path.m4
@@ -12,22 +12,21 @@ dnl
AC_PREFIX_DEFAULT(/usr/local/samba)
# Defaults and --without-fhs
- configdir="\${LIBDIR}"
logfilebase="\${localstatedir}"
lockdir="\${localstatedir}/locks"
- piddir="\${localstatedir}/locks"
+ piddir="\${localstatedir}/run"
privatedir="\${prefix}/private"
- swatdir="\${prefix}/swat"
AC_ARG_WITH(fhs,
[ --with-fhs Use FHS-compliant paths (default=no)],
- configdir="${sysconfdir}/samba"
lockdir="\${localstatedir}/lib/samba"
piddir="\${localstatedir}/run/samba"
logfilebase="\${localstatedir}/log/samba"
- privatedir="\${CONFIGDIR}/private"
- libdir="\${prefix}/lib/samba"
- swatdir="\${datadir}/samba/swat")
+ privatedir="\${localstatedir}/lib/samba/private"
+ libdir="\${libdir}/samba"
+ datadir="\${datadir}/samba"
+ includedir="\${includedir}/samba-4.0"
+)
#################################################
# set private directory location
@@ -78,22 +77,6 @@ AC_ARG_WITH(piddir,
esac])
#################################################
-# set configuration directory location
-AC_ARG_WITH(configdir,
-[ --with-configdir=DIR Where to put configuration files (\$libdir)],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-configdir called without argument - will use default])
- ;;
- * )
- configdir="$withval"
- ;;
- esac])
-
-#################################################
# set log directory location
AC_ARG_WITH(logfilebase,
[ --with-logfilebase=DIR Where to put log files (\$(VARDIR))],
@@ -110,40 +93,12 @@ 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])
-
-#################################################
-# set lib directory location
-AC_ARG_WITH(libdir,
-[ --with-libdir=DIR Where to put modules files (\$libdir)],
-[ case "$withval" in
- yes|no)
- AC_MSG_WARN([--with-libdir called without argument - will use default])
- ;;
- * )
- libdir="$withval"
- ;;
- esac])
-
-AC_SUBST(configdir)
AC_SUBST(lockdir)
AC_SUBST(piddir)
AC_SUBST(logfilebase)
AC_SUBST(privatedir)
AC_SUBST(bindir)
AC_SUBST(sbindir)
-AC_SUBST(swatdir)
#################################################
# set prefix for 'make test'
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index cbcc40c810..022fcaa9bc 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -74,9 +74,11 @@ datadir = $self->{config}->{datadir}
LIBDIR = $self->{config}->{libdir}
MODULESDIR = $self->{config}->{libdir}
INCLUDEDIR = $self->{config}->{includedir}
-CONFIGDIR = $self->{config}->{configdir}
+CONFIGDIR = $self->{config}->{sysconfdir}
localstatedir = $self->{config}->{localstatedir}
-SWATDIR = $self->{config}->{swatdir}
+SWATDIR = $self->{config}->{datadir}/swat
+JSDIR = $self->{config}->{datadir}/js
+SETUPDIR = $self->{config}->{datadir}/setup
VARDIR = $self->{config}->{localstatedir}
LOGFILEBASE = $self->{config}->{logfilebase}
NCALRPCDIR = $self->{config}->{localstatedir}/ncalrpc
diff --git a/source4/main.mk b/source4/main.mk
index 5ce3383e55..a58729e73b 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -54,6 +54,8 @@ showlayout:
@echo ' piddir: $(PIDDIR)'
@echo ' lockdir: $(LOCKDIR)'
@echo ' logfilebase: $(LOGFILEBASE)'
+ @echo ' setupdir: $(SETUPDIR)'
+ @echo ' jsdir: $(JSDIR)'
@echo ' swatdir: $(SWATDIR)'
@echo ' mandir: $(MANDIR)'
@@ -142,7 +144,7 @@ installman: installdirs
@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(MANPAGES)
installmisc: installdirs
- @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR)
+ @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(JSDIR) $(DESTDIR)$(SETUPDIR) $(DESTDIR)$(BINDIR)
installpc: installdirs
@$(SHELL) $(srcdir)/script/installpc.sh $(srcdir) $(DESTDIR)$(PKGCONFIGDIR) $(PC_FILES)
diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index dab1b527ca..2fa2f96f1d 100755
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -2,20 +2,21 @@
# install miscellaneous files
SRCDIR="$1"
-LIBDIR="$2"
-BINDIR="$3"
+JSDIR="$2"
+SETUPDIR="$3"
+BINDIR="$4"
cd $SRCDIR || exit 1
echo "Installing js libs"
-mkdir -p $LIBDIR/js || exit 1
-cp scripting/libjs/*.js $LIBDIR/js || exit 1
+mkdir -p $JSDIR || exit 1
+cp scripting/libjs/*.js $JSDIR/js || exit 1
echo "Installing setup templates"
-mkdir -p $LIBDIR/setup || exit 1
-cp setup/*.ldif $LIBDIR/setup || exit 1
-cp setup/*.zone $LIBDIR/setup || exit 1
-cp setup/*.conf $LIBDIR/setup || exit 1
+mkdir -p $SETUPDIR || exit 1
+cp setup/*.ldif $SETUPDIR || exit 1
+cp setup/*.zone $SETUPDIR || exit 1
+cp setup/*.conf $SETUPDIR || exit 1
echo "Installing script tools"
mkdir -p "$BINDIR"