Skip to content

Commit 63b1a9b

Browse files
erthinkerthink
committed
install: hotfix slaptools install, sbin instead of libexec.
Change-Id: If66fc74dfbdb7fe52804e3b9adb69cadad5deb99
1 parent 3834792 commit 63b1a9b

File tree

4 files changed

+72
-55
lines changed

4 files changed

+72
-55
lines changed

‎build/BRANDING

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RELEASE_TYPE=Release
3131

3232
VERSION_MAJOR=1
3333
VERSION_MINOR=1
34-
VERSION_PATCH_LEVEL=0
34+
VERSION_PATCH_LEVEL=1
3535

3636
API_CURRENT=12
3737
API_REVISON=7

‎configure

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /bin/sh
22
# From configure.ac Id: 8c9139400f1cfd3f68bc9b65828515fe85e91ee1 .
33
# Guess values for system-dependent variables and create Makefiles.
4-
# Generated by GNU Autoconf 2.69 for ReOpenLDAP 1.1.0-Release 1.1.0.
4+
# Generated by GNU Autoconf 2.69 for ReOpenLDAP 1.1.1-Release 1.1.1.
55
#
66
# Report bugs to <https://github.com/ReOpen/ReOpenLDAP/issues>.
77
#
@@ -614,10 +614,10 @@ MFLAGS=
614614
MAKEFLAGS=
615615

616616
# Identity of this package.
617-
PACKAGE_NAME='ReOpenLDAP 1.1.0-Release'
617+
PACKAGE_NAME='ReOpenLDAP 1.1.1-Release'
618618
PACKAGE_TARNAME='reopenldap'
619-
PACKAGE_VERSION='1.1.0'
620-
PACKAGE_STRING='ReOpenLDAP 1.1.0-Release 1.1.0'
619+
PACKAGE_VERSION='1.1.1'
620+
PACKAGE_STRING='ReOpenLDAP 1.1.1-Release 1.1.1'
621621
PACKAGE_BUGREPORT='https://github.com/ReOpen/ReOpenLDAP/issues'
622622
PACKAGE_URL='https://github.com/ReOpen/ReOpenLDAP/wiki'
623623

@@ -1689,7 +1689,7 @@ if test "$ac_init_help" = "long"; then
16891689
# Omit some internal or obsolete options to make the list less imposing.
16901690
# This message is too long to be a string in the A/UX 3.1 sh.
16911691
cat <<_ACEOF
1692-
\`configure' configures ReOpenLDAP 1.1.0-Release 1.1.0 to adapt to many kinds of systems.
1692+
\`configure' configures ReOpenLDAP 1.1.1-Release 1.1.1 to adapt to many kinds of systems.
16931693

16941694
Usage: $0 [OPTION]... [VAR=VALUE]...
16951695

@@ -1761,7 +1761,7 @@ fi
17611761

17621762
if test -n "$ac_init_help"; then
17631763
case $ac_init_help in
1764-
short | recursive ) echo "Configuration of ReOpenLDAP 1.1.0-Release 1.1.0:";;
1764+
short | recursive ) echo "Configuration of ReOpenLDAP 1.1.1-Release 1.1.1:";;
17651765
esac
17661766
cat <<\_ACEOF
17671767

@@ -1897,7 +1897,7 @@ Use these variables to override the choices made by `configure' or to help
18971897
it to find libraries and programs with nonstandard names/locations.
18981898

18991899
Report bugs to <https://github.com/ReOpen/ReOpenLDAP/issues>.
1900-
ReOpenLDAP 1.1.0-Release home page: <https://github.com/ReOpen/ReOpenLDAP/wiki>.
1900+
ReOpenLDAP 1.1.1-Release home page: <https://github.com/ReOpen/ReOpenLDAP/wiki>.
19011901
_ACEOF
19021902
ac_status=$?
19031903
fi
@@ -1960,7 +1960,7 @@ fi
19601960
test -n "$ac_init_help" && exit $ac_status
19611961
if $ac_init_version; then
19621962
cat <<\_ACEOF
1963-
ReOpenLDAP 1.1.0-Release configure 1.1.0
1963+
ReOpenLDAP 1.1.1-Release configure 1.1.1
19641964
generated by GNU Autoconf 2.69
19651965

19661966
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2813,7 +2813,7 @@ cat >config.log <<_ACEOF
28132813
This file contains any messages produced by compilers while
28142814
running configure, to aid debugging if configure makes a mistake.
28152815

2816-
It was created by ReOpenLDAP 1.1.0-Release $as_me 1.1.0, which was
2816+
It was created by ReOpenLDAP 1.1.1-Release $as_me 1.1.1, which was
28172817
generated by GNU Autoconf 2.69. Invocation command line was
28182818

28192819
$ $0 $@
@@ -3822,7 +3822,7 @@ fi
38223822

38233823
# Define the identity of the package.
38243824
PACKAGE='reopenldap'
3825-
VERSION='1.1.0'
3825+
VERSION='1.1.1'
38263826

38273827

38283828
cat >>confdefs.h <<_ACEOF
@@ -14077,17 +14077,17 @@ eval "LTDLOPEN=\"$libname_spec\""
1407714077

1407814078

1407914079

14080-
VERSION_NUMBER=10100
14080+
VERSION_NUMBER=10101
1408114081

1408214082
VERSION_MAJOR=1
1408314083

1408414084
VERSION_MINOR=1
1408514085

14086-
VERSION_PATCH=0
14086+
VERSION_PATCH=1
1408714087

14088-
RELEASE_DATE=2016-06-30
14088+
RELEASE_DATE=2016-07-12
1408914089

14090-
RELEASE_STAMP=ga8d32244a9e2-t0c85708f51e14879
14090+
RELEASE_STAMP=g482853092fc4-t45cc6f7ecf12d453
1409114091

1409214092
API_LIB_RELEASE=1.1
1409314093

@@ -33796,7 +33796,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3379633796
# report actual input values of CONFIG_FILES etc. instead of their
3379733797
# values after options handling.
3379833798
ac_log="
33799-
This file was extended by ReOpenLDAP 1.1.0-Release $as_me 1.1.0, which was
33799+
This file was extended by ReOpenLDAP 1.1.1-Release $as_me 1.1.1, which was
3380033800
generated by GNU Autoconf 2.69. Invocation command line was
3380133801

3380233802
CONFIG_FILES = $CONFIG_FILES
@@ -33857,13 +33857,13 @@ Configuration commands:
3385733857
$config_commands
3385833858

3385933859
Report bugs to <https://github.com/ReOpen/ReOpenLDAP/issues>.
33860-
ReOpenLDAP 1.1.0-Release home page: <https://github.com/ReOpen/ReOpenLDAP/wiki>."
33860+
ReOpenLDAP 1.1.1-Release home page: <https://github.com/ReOpen/ReOpenLDAP/wiki>."
3386133861

3386233862
_ACEOF
3386333863
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3386433864
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
3386533865
ac_cs_version="\\
33866-
ReOpenLDAP 1.1.0-Release config.status 1.1.0
33866+
ReOpenLDAP 1.1.1-Release config.status 1.1.1
3386733867
configured by $0, generated by GNU Autoconf 2.69,
3386833868
with options \\"\$ac_cs_config\\"
3386933869

‎servers/slapd/Makefile.am

+9-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ overlays_BUILTIN =
3030
overlays_DYNAMIC =
3131

3232
AM_CPPFLAGS = -I${top_srcdir}/include
33-
libexec_PROGRAMS = slapd
33+
sbin_PROGRAMS = slapd
34+
slaptools = slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema
3435
slapd_LDADD = overlays/liboverlays_builtin.la
3536
slapd_LDFLAGS =
3637

@@ -432,6 +433,13 @@ slapd.conf: $(srcdir)/slapd.conf.in Makefile
432433

433434
EXTRA_DIST += $(schema_files)
434435

436+
install-exec-hook:
437+
(cd $(sbindir) && \
438+
$(RM) -f $(slaptools) && \
439+
for T in $(slaptools); do \
440+
$(LN_S) slapd$(EXEEXT) $${T}$(EXEEXT) || exit 1; \
441+
done)
442+
435443
install-data-hook:
436444
$(MKDIR_P) $(sysconfdir)/schema && \
437445
(cd $(srcdir) && $(INSTALL) -t $(sysconfdir)/schema -m 0444 $(schema_files))

‎servers/slapd/Makefile.in

+45-36
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ POST_UNINSTALL = :
9090
build_triplet = @build@
9191
host_triplet = @host@
9292
target_triplet = @target@
93-
libexec_PROGRAMS = slapd$(EXEEXT)
93+
sbin_PROGRAMS = slapd$(EXEEXT)
9494
@BUILD_LDIF_TRUE@am__append_1 = back-ldif
9595
@BUILD_LDIF_TRUE@@LDIF_DYNAMIC_TRUE@am__append_2 = ldif
9696
@BUILD_LDIF_TRUE@@LDIF_DYNAMIC_FALSE@am__append_3 = ldif
@@ -226,8 +226,8 @@ CONFIG_HEADER = $(top_builddir)/reldap_autoconf.h \
226226
$(top_builddir)/include/lber_types.h
227227
CONFIG_CLEAN_FILES =
228228
CONFIG_CLEAN_VPATH_FILES =
229-
am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sysconfdir)"
230-
PROGRAMS = $(libexec_PROGRAMS)
229+
am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sysconfdir)"
230+
PROGRAMS = $(sbin_PROGRAMS)
231231
am_slapd_OBJECTS = abandon.$(OBJEXT) aci.$(OBJEXT) acl.$(OBJEXT) \
232232
aclparse.$(OBJEXT) ad.$(OBJEXT) add.$(OBJEXT) alock.$(OBJEXT) \
233233
at.$(OBJEXT) attr.$(OBJEXT) ava.$(OBJEXT) backend.$(OBJEXT) \
@@ -638,6 +638,7 @@ overlays_BUILTIN = $(am__append_72) $(am__append_73) $(am__append_74) \
638638
$(am__append_90) $(am__append_91)
639639
overlays_DYNAMIC =
640640
AM_CPPFLAGS = -I${top_srcdir}/include $(am__append_69)
641+
slaptools = slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema
641642
slapd_LDADD = overlays/liboverlays_builtin.la $(am__append_4) \
642643
$(am__append_8) $(am__append_12) $(am__append_16) \
643644
$(am__append_20) $(am__append_24) $(am__append_28) \
@@ -719,12 +720,12 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
719720
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
720721
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
721722
$(am__aclocal_m4_deps):
722-
install-libexecPROGRAMS: $(libexec_PROGRAMS)
723+
install-sbinPROGRAMS: $(sbin_PROGRAMS)
723724
@$(NORMAL_INSTALL)
724-
@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
725+
@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
725726
if test -n "$$list"; then \
726-
echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
727-
$(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
727+
echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
728+
$(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
728729
fi; \
729730
for p in $$list; do echo "$$p $$p"; done | \
730731
sed 's/$(EXEEXT)$$//' | \
@@ -744,24 +745,24 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
744745
while read type dir files; do \
745746
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
746747
test -z "$$files" || { \
747-
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
748-
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
748+
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
749+
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
749750
} \
750751
; done
751752

752-
uninstall-libexecPROGRAMS:
753+
uninstall-sbinPROGRAMS:
753754
@$(NORMAL_UNINSTALL)
754-
@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
755+
@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
755756
files=`for p in $$list; do echo "$$p"; done | \
756757
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
757758
-e 's/$$/$(EXEEXT)/' \
758759
`; \
759760
test -n "$$list" || exit 0; \
760-
echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
761-
cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
761+
echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
762+
cd "$(DESTDIR)$(sbindir)" && rm -f $$files
762763

763-
clean-libexecPROGRAMS:
764-
@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
764+
clean-sbinPROGRAMS:
765+
@list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
765766
echo " rm -f" $$list; \
766767
rm -f $$list || exit $$?; \
767768
test -n "$(EXEEXT)" || exit 0; \
@@ -1080,7 +1081,7 @@ check: $(BUILT_SOURCES)
10801081
all-am: Makefile $(PROGRAMS) $(DATA)
10811082
installdirs: installdirs-recursive
10821083
installdirs-am:
1083-
for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sysconfdir)"; do \
1084+
for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sysconfdir)"; do \
10841085
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
10851086
done
10861087
install: $(BUILT_SOURCES)
@@ -1118,7 +1119,7 @@ maintainer-clean-generic:
11181119
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
11191120
clean: clean-recursive
11201121

1121-
clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
1122+
clean-am: clean-generic clean-libtool clean-sbinPROGRAMS \
11221123
mostlyclean-am
11231124

11241125
distclean: distclean-recursive
@@ -1146,8 +1147,9 @@ install-dvi: install-dvi-recursive
11461147

11471148
install-dvi-am:
11481149

1149-
install-exec-am: install-libexecPROGRAMS install-sysconfDATA
1150-
1150+
install-exec-am: install-sbinPROGRAMS install-sysconfDATA
1151+
@$(NORMAL_INSTALL)
1152+
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
11511153
install-html: install-html-recursive
11521154

11531155
install-html-am:
@@ -1186,28 +1188,28 @@ ps: ps-recursive
11861188

11871189
ps-am:
11881190

1189-
uninstall-am: uninstall-libexecPROGRAMS uninstall-sysconfDATA
1191+
uninstall-am: uninstall-sbinPROGRAMS uninstall-sysconfDATA
11901192
@$(NORMAL_INSTALL)
11911193
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
11921194
.MAKE: $(am__recursive_targets) all check install install-am \
1193-
install-data-am install-strip uninstall-am
1195+
install-data-am install-exec-am install-strip uninstall-am
11941196

11951197
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
1196-
check-am clean clean-generic clean-libexecPROGRAMS \
1197-
clean-libtool cscopelist-am ctags ctags-am distclean \
1198-
distclean-compile distclean-generic distclean-libtool \
1199-
distclean-tags distdir dvi dvi-am html html-am info info-am \
1200-
install install-am install-data install-data-am \
1201-
install-data-hook install-dvi install-dvi-am install-exec \
1202-
install-exec-am install-html install-html-am install-info \
1203-
install-info-am install-libexecPROGRAMS install-man \
1204-
install-pdf install-pdf-am install-ps install-ps-am \
1205-
install-strip install-sysconfDATA installcheck installcheck-am \
1206-
installdirs installdirs-am maintainer-clean \
1207-
maintainer-clean-generic mostlyclean mostlyclean-compile \
1208-
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1209-
tags tags-am uninstall uninstall-am uninstall-hook \
1210-
uninstall-libexecPROGRAMS uninstall-sysconfDATA
1198+
check-am clean clean-generic clean-libtool clean-sbinPROGRAMS \
1199+
cscopelist-am ctags ctags-am distclean distclean-compile \
1200+
distclean-generic distclean-libtool distclean-tags distdir dvi \
1201+
dvi-am html html-am info info-am install install-am \
1202+
install-data install-data-am install-data-hook install-dvi \
1203+
install-dvi-am install-exec install-exec-am install-exec-hook \
1204+
install-html install-html-am install-info install-info-am \
1205+
install-man install-pdf install-pdf-am install-ps \
1206+
install-ps-am install-sbinPROGRAMS install-strip \
1207+
install-sysconfDATA installcheck installcheck-am installdirs \
1208+
installdirs-am maintainer-clean maintainer-clean-generic \
1209+
mostlyclean mostlyclean-compile mostlyclean-generic \
1210+
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
1211+
uninstall-am uninstall-hook uninstall-sbinPROGRAMS \
1212+
uninstall-sysconfDATA
12111213

12121214
.PRECIOUS: Makefile
12131215

@@ -1259,6 +1261,13 @@ slapd.conf: $(srcdir)/slapd.conf.in Makefile
12591261
echo "# Generated from $< on `date --rfc-3339=seconds --utc`" > $@ && \
12601262
$(FIXUP_DIST) $< | $(FIXUP_DIRS) >> $@
12611263

1264+
install-exec-hook:
1265+
(cd $(sbindir) && \
1266+
$(RM) -f $(slaptools) && \
1267+
for T in $(slaptools); do \
1268+
$(LN_S) slapd$(EXEEXT) $${T}$(EXEEXT) || exit 1; \
1269+
done)
1270+
12621271
install-data-hook:
12631272
$(MKDIR_P) $(sysconfdir)/schema && \
12641273
(cd $(srcdir) && $(INSTALL) -t $(sysconfdir)/schema -m 0444 $(schema_files))

0 commit comments

Comments
 (0)