sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

r13153: Try to move closer to FHS. This probably breaks everything...

Browse Source 
Andrew Bartlett
(This used to be commit 2c02a45d5a6c79ced7aea0f7e9d23fae19c2d127)
This commit is contained in:
Andrew Bartlett 2006-01-26 05:57:53 +00:00 committed by Gerald (Jerry) Carter
parent b2050691a7
commit 2f8b1050e1
4 changed files with 22 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
source4/build/m4/check_path.m4
View File

@ -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
@ -77,22 +76,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,
@ -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'

6
source4/build/smb_build/makefile.pm
View File

@ -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

4
source4/main.mk
View File

@ -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)

17
source4/script/installmisc.sh
View File

@ -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"