install: hotfix slaptools install, sbin instead of libexec.

Change-Id: If66fc74dfbdb7fe52804e3b9adb69cadad5deb99

build/BRANDING

@@ -31,7 +31,7 @@ RELEASE_TYPE=Release
 
 VERSION_MAJOR=1
 VERSION_MINOR=1
-VERSION_PATCH_LEVEL=0
+VERSION_PATCH_LEVEL=1
 
 API_CURRENT=12
 API_REVISON=7

configure

@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Id: 8c9139400f1cfd3f68bc9b65828515fe85e91ee1 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ReOpenLDAP 1.1.0-Release 1.1.0.
+# Generated by GNU Autoconf 2.69 for ReOpenLDAP 1.1.1-Release 1.1.1.
 #
 # Report bugs to <https://github.com/ReOpen/ReOpenLDAP/issues>.
 #
@@ -614,10 +614,10 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='ReOpenLDAP 1.1.0-Release'
+PACKAGE_NAME='ReOpenLDAP 1.1.1-Release'
 PACKAGE_TARNAME='reopenldap'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='ReOpenLDAP 1.1.0-Release 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='ReOpenLDAP 1.1.1-Release 1.1.1'
 PACKAGE_BUGREPORT='https://github.com/ReOpen/ReOpenLDAP/issues'
 PACKAGE_URL='https://github.com/ReOpen/ReOpenLDAP/wiki'
 
@@ -1689,7 +1689,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ReOpenLDAP 1.1.0-Release 1.1.0 to adapt to many kinds of systems.
+\`configure' configures ReOpenLDAP 1.1.1-Release 1.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1761,7 +1761,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ReOpenLDAP 1.1.0-Release 1.1.0:";;
+     short | recursive ) echo "Configuration of ReOpenLDAP 1.1.1-Release 1.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1897,7 +1897,7 @@ Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <https://github.com/ReOpen/ReOpenLDAP/issues>.
-ReOpenLDAP 1.1.0-Release home page: <https://github.com/ReOpen/ReOpenLDAP/wiki>.
+ReOpenLDAP 1.1.1-Release home page: <https://github.com/ReOpen/ReOpenLDAP/wiki>.
 _ACEOF
 ac_status=$?
 fi
@@ -1960,7 +1960,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ReOpenLDAP 1.1.0-Release configure 1.1.0
+ReOpenLDAP 1.1.1-Release configure 1.1.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2813,7 +2813,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ReOpenLDAP 1.1.0-Release $as_me 1.1.0, which was
+It was created by ReOpenLDAP 1.1.1-Release $as_me 1.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3822,7 +3822,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='reopenldap'
- VERSION='1.1.0'
+ VERSION='1.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14077,17 +14077,17 @@ eval "LTDLOPEN=\"$libname_spec\""
 
 
 
-VERSION_NUMBER=10100
+VERSION_NUMBER=10101
 
 VERSION_MAJOR=1
 
 VERSION_MINOR=1
 
-VERSION_PATCH=0
+VERSION_PATCH=1
 
-RELEASE_DATE=2016-06-30
+RELEASE_DATE=2016-07-12
 
-RELEASE_STAMP=ga8d32244a9e2-t0c85708f51e14879
+RELEASE_STAMP=g482853092fc4-t45cc6f7ecf12d453
 
 API_LIB_RELEASE=1.1
 
@@ -33796,7 +33796,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ReOpenLDAP 1.1.0-Release $as_me 1.1.0, which was
+This file was extended by ReOpenLDAP 1.1.1-Release $as_me 1.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -33857,13 +33857,13 @@ Configuration commands:
 $config_commands
 
 Report bugs to <https://github.com/ReOpen/ReOpenLDAP/issues>.
-ReOpenLDAP 1.1.0-Release home page: <https://github.com/ReOpen/ReOpenLDAP/wiki>."
+ReOpenLDAP 1.1.1-Release home page: <https://github.com/ReOpen/ReOpenLDAP/wiki>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ReOpenLDAP 1.1.0-Release config.status 1.1.0
+ReOpenLDAP 1.1.1-Release config.status 1.1.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

servers/slapd/Makefile.am

@@ -30,7 +30,8 @@ overlays_BUILTIN =
 overlays_DYNAMIC =
 
 AM_CPPFLAGS = -I${top_srcdir}/include
-libexec_PROGRAMS = slapd
+sbin_PROGRAMS = slapd
+slaptools = slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema
 slapd_LDADD = overlays/liboverlays_builtin.la
 slapd_LDFLAGS =
 
@@ -432,6 +433,13 @@ slapd.conf: $(srcdir)/slapd.conf.in Makefile
 
 EXTRA_DIST += $(schema_files)
 
+install-exec-hook:
+	(cd $(sbindir) && \
+		$(RM) -f $(slaptools) && \
+		for T in $(slaptools); do \
+			$(LN_S) slapd$(EXEEXT) $${T}$(EXEEXT) || exit 1; \
+		done)
+
 install-data-hook:
 	$(MKDIR_P) $(sysconfdir)/schema && \
 		(cd $(srcdir) && $(INSTALL) -t $(sysconfdir)/schema -m 0444 $(schema_files))

servers/slapd/Makefile.in

@@ -90,7 +90,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-libexec_PROGRAMS = slapd$(EXEEXT)
+sbin_PROGRAMS = slapd$(EXEEXT)
 @BUILD_LDIF_TRUE@am__append_1 = back-ldif
 @BUILD_LDIF_TRUE@@LDIF_DYNAMIC_TRUE@am__append_2 = ldif
 @BUILD_LDIF_TRUE@@LDIF_DYNAMIC_FALSE@am__append_3 = ldif
@@ -226,8 +226,8 @@ CONFIG_HEADER = $(top_builddir)/reldap_autoconf.h \
 	$(top_builddir)/include/lber_types.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sysconfdir)"
-PROGRAMS = $(libexec_PROGRAMS)
+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sysconfdir)"
+PROGRAMS = $(sbin_PROGRAMS)
 am_slapd_OBJECTS = abandon.$(OBJEXT) aci.$(OBJEXT) acl.$(OBJEXT) \
 	aclparse.$(OBJEXT) ad.$(OBJEXT) add.$(OBJEXT) alock.$(OBJEXT) \
 	at.$(OBJEXT) attr.$(OBJEXT) ava.$(OBJEXT) backend.$(OBJEXT) \
@@ -638,6 +638,7 @@ overlays_BUILTIN = $(am__append_72) $(am__append_73) $(am__append_74) \
 	$(am__append_90) $(am__append_91)
 overlays_DYNAMIC = 
 AM_CPPFLAGS = -I${top_srcdir}/include $(am__append_69)
+slaptools = slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema
 slapd_LDADD = overlays/liboverlays_builtin.la $(am__append_4) \
 	$(am__append_8) $(am__append_12) $(am__append_16) \
 	$(am__append_20) $(am__append_24) $(am__append_28) \
@@ -719,12 +720,12 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-libexecPROGRAMS: $(libexec_PROGRAMS)
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
@@ -744,24 +745,24 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	while read type dir files; do \
 	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
 	    } \
 	; done
 
-uninstall-libexecPROGRAMS:
+uninstall-sbinPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
 	      -e 's/$$/$(EXEEXT)/' \
 	`; \
 	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
 
-clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
 	rm -f $$list || exit $$?; \
 	test -n "$(EXEEXT)" || exit 0; \
@@ -1080,7 +1081,7 @@ check: $(BUILT_SOURCES)
 all-am: Makefile $(PROGRAMS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sysconfdir)"; do \
+	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sysconfdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -1118,7 +1119,7 @@ maintainer-clean-generic:
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-recursive
 
-clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
+clean-am: clean-generic clean-libtool clean-sbinPROGRAMS \
 	mostlyclean-am
 
 distclean: distclean-recursive
@@ -1146,8 +1147,9 @@ install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
-install-exec-am: install-libexecPROGRAMS install-sysconfDATA
-
+install-exec-am: install-sbinPROGRAMS install-sysconfDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-recursive
 
 install-html-am:
@@ -1186,28 +1188,28 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-libexecPROGRAMS uninstall-sysconfDATA
+uninstall-am: uninstall-sbinPROGRAMS uninstall-sysconfDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 .MAKE: $(am__recursive_targets) all check install install-am \
-	install-data-am install-strip uninstall-am
+	install-data-am install-exec-am install-strip uninstall-am
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libexecPROGRAMS \
-	clean-libtool cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-hook install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libexecPROGRAMS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip install-sysconfDATA installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-hook \
-	uninstall-libexecPROGRAMS uninstall-sysconfDATA
+	check-am clean clean-generic clean-libtool clean-sbinPROGRAMS \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-hook install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-hook \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-sbinPROGRAMS install-strip \
+	install-sysconfDATA installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-hook uninstall-sbinPROGRAMS \
+	uninstall-sysconfDATA
 
 .PRECIOUS: Makefile
 
@@ -1259,6 +1261,13 @@ slapd.conf: $(srcdir)/slapd.conf.in Makefile
 	echo "# Generated from $< on `date --rfc-3339=seconds --utc`" > $@ && \
 	$(FIXUP_DIST) $< | $(FIXUP_DIRS) >> $@
 
+install-exec-hook:
+	(cd $(sbindir) && \
+		$(RM) -f $(slaptools) && \
+		for T in $(slaptools); do \
+			$(LN_S) slapd$(EXEEXT) $${T}$(EXEEXT) || exit 1; \
+		done)
+
 install-data-hook:
 	$(MKDIR_P) $(sysconfdir)/schema && \
 		(cd $(srcdir) && $(INSTALL) -t $(sysconfdir)/schema -m 0444 $(schema_files))