Add --with-subdir to allow user specification of install subdirectory

to be used.  --without-subdir can be used to specify no subdirectory.

build/top.mk

@@ -17,8 +17,9 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
+ldap_subdir = @ldap_subdir@
 bindir = @bindir@
-datadir = @datadir@/@ldap_subdir@
+datadir = @datadir@/$(ldap_subdir)
 includedir = @includedir@
 infodir = @infodir@
 libdir = @libdir@
@@ -27,7 +28,7 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@/@ldap_subdir@
+sysconfdir = @sysconfdir@/$(ldap_subdir)
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

configure.in

@@ -29,6 +29,14 @@ AC_SUBST(top_builddir)dnl
 ldap_subdir="openldap"
 AC_SUBST(ldap_subdir)dnl
 
+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="$withval"
+	fi
+])dnl
+
 OL_ARG_ENABLE(debug,[  --enable-debug 	enable debugging], yes)dnl
 dnl OL_ARG_ENABLE(syslog,[  --enable-syslog	enable syslog support], auto)dnl
 OL_ARG_ENABLE(proctitle,[  --enable-proctitle	enable proctitle support], yes)dnl