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