Rework --without-subdir to remove trailing /

build/top.mk

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

configure.in

@@ -46,14 +46,22 @@ AC_PREFIX_DEFAULT(/usr/local)
 top_builddir=`pwd`
 AC_SUBST(top_builddir)dnl
 
-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
+ldap_subdir="/openldap"
+
+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