mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-20 22:59:34 -05:00
Rework --without-subdir to remove trailing /
This commit is contained in:
parent
7015167974
commit
e3f34e305f
3 changed files with 619 additions and 605 deletions
|
|
@ -22,17 +22,17 @@ exec_prefix = @exec_prefix@
|
||||||
ldap_subdir = @ldap_subdir@
|
ldap_subdir = @ldap_subdir@
|
||||||
|
|
||||||
bindir = $(TMPROOT)@bindir@
|
bindir = $(TMPROOT)@bindir@
|
||||||
datadir = $(TMPROOT)@datadir@/$(ldap_subdir)
|
datadir = $(TMPROOT)@datadir@$(ldap_subdir)
|
||||||
includedir = $(TMPROOT)@includedir@
|
includedir = $(TMPROOT)@includedir@
|
||||||
infodir = $(TMPROOT)@infodir@
|
infodir = $(TMPROOT)@infodir@
|
||||||
libdir = $(TMPROOT)@libdir@
|
libdir = $(TMPROOT)@libdir@
|
||||||
libexecdir = $(TMPROOT)@libexecdir@
|
libexecdir = $(TMPROOT)@libexecdir@
|
||||||
localstatedir = $(TMPROOT)@localstatedir@
|
localstatedir = $(TMPROOT)@localstatedir@
|
||||||
mandir = $(TMPROOT)@mandir@
|
mandir = $(TMPROOT)@mandir@
|
||||||
moduledir = $(TMPROOT)@libexecdir@/$(ldap_subdir)
|
moduledir = $(TMPROOT)@libexecdir@$(ldap_subdir)
|
||||||
sbindir = $(TMPROOT)@sbindir@
|
sbindir = $(TMPROOT)@sbindir@
|
||||||
sharedstatedir = $(TMPROOT)@sharedstatedir@
|
sharedstatedir = $(TMPROOT)@sharedstatedir@
|
||||||
sysconfdir = $(TMPROOT)@sysconfdir@/$(ldap_subdir)
|
sysconfdir = $(TMPROOT)@sysconfdir@$(ldap_subdir)
|
||||||
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
OBJEXT = @OBJEXT@
|
OBJEXT = @OBJEXT@
|
||||||
|
|
|
||||||
20
configure.in
20
configure.in
|
|
@ -46,14 +46,22 @@ AC_PREFIX_DEFAULT(/usr/local)
|
||||||
top_builddir=`pwd`
|
top_builddir=`pwd`
|
||||||
AC_SUBST(top_builddir)dnl
|
AC_SUBST(top_builddir)dnl
|
||||||
|
|
||||||
ldap_subdir="openldap"
|
ldap_subdir="/openldap"
|
||||||
|
|
||||||
AC_ARG_WITH(subdir, [ --with-subdir=DIR change default subdirectory used for installs], [
|
AC_ARG_WITH(subdir,
|
||||||
if test "$withval" = "no"; then
|
[ --with-subdir=DIR change default subdirectory used for installs],
|
||||||
ldap_subdir=""
|
[case "$withval" in
|
||||||
elif test "$withval" != "yes"; then
|
no) ldap_subdir=""
|
||||||
|
;;
|
||||||
|
yes)
|
||||||
|
;;
|
||||||
|
/*|\\*)
|
||||||
ldap_subdir="$withval"
|
ldap_subdir="$withval"
|
||||||
fi
|
;;
|
||||||
|
*)
|
||||||
|
ldap_subdir="/$withval"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
])dnl
|
])dnl
|
||||||
|
|
||||||
AC_SUBST(ldap_subdir)dnl
|
AC_SUBST(ldap_subdir)dnl
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue