diff --git a/build/man.mk b/build/man.mk
index 91a96065cba6d12bcc144ef65532e0fc6d02d114..5d7c644f4534687ee962890654e81c6bef405a6b 100644
--- a/build/man.mk
+++ b/build/man.mk
@@ -26,17 +26,17 @@ all-common:
done
install-common:
- -$(MKDIR) $(MANDIR)
+ -$(MKDIR) $(DESTDIR)$(MANDIR)
PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
for page in $$PAGES; do \
echo "installing $(MANDIR)/$$page"; \
- $(RM) $(MANDIR)/$$page; \
- $(INSTALL) $(INSTALLFLAGS) -m 644 $$page.$(TMP_SUFFIX) $(MANDIR)/$$page; \
+ $(RM) $(DESTDIR)$(MANDIR)/$$page; \
+ $(INSTALL) $(INSTALLFLAGS) -m 644 $$page.$(TMP_SUFFIX) $(DESTDIR)$(MANDIR)/$$page; \
if test -f "$(srcdir)/$$page.links" ; then \
for link in `$(CAT) $(srcdir)/$$page.links`; do \
echo "installing $(MANDIR)/$$link as link to $$page"; \
- $(RM) $(MANDIR)/$$link ; \
- $(LN_S) $$page $(MANDIR)/$$link; \
+ $(RM) $(DESTDIR)$(MANDIR)/$$link ; \
+ $(LN_S) $$page $(DESTDIR)$(MANDIR)/$$link; \
done; \
fi; \
done
diff --git a/build/mod.mk b/build/mod.mk
index 380e1dc78c4191a97c9c4938a54562beaaa5f55c..ce88c5ceecc50b80071692503c85b5fd90f9e490 100644
--- a/build/mod.mk
+++ b/build/mod.mk
@@ -46,8 +46,8 @@ all-local-lib:
all-yes: $(LIBSTAT) all-local-lib FORCE
install-mod: $(LIBRARY)
- @-$(MKDIR) $(moduledir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(moduledir)
+ @-$(MKDIR) $(DESTDIR)$(moduledir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(moduledir)
install-local-lib:
install-yes: install-local-lib FORCE
diff --git a/build/top.mk b/build/top.mk
index 550d52d8b5c6c0170a1d988086cc2018c52fb7d4..519708a216d267fcd1781a782997ca6d5e1b393d 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -22,18 +22,18 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
ldap_subdir = @ldap_subdir@
-bindir = $(TMPROOT)@bindir@
-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)
-sbindir = $(TMPROOT)@sbindir@
-sharedstatedir = $(TMPROOT)@sharedstatedir@
-sysconfdir = $(TMPROOT)@sysconfdir@$(ldap_subdir)
+bindir = @bindir@
+datadir = @datadir@$(ldap_subdir)
+includedir = @includedir@
+infodir = @infodir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+moduledir = @libexecdir@$(ldap_subdir)
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@$(ldap_subdir)
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
diff --git a/clients/fax500/Makefile.in b/clients/fax500/Makefile.in
index 4520a63ef6c3cd5d7b014b270f1777e8b6732de6..037ad897ba248d13bbf6851892b8ac85406b4e4c 100644
--- a/clients/fax500/Makefile.in
+++ b/clients/fax500/Makefile.in
@@ -32,7 +32,7 @@ xrpcomp.tmp: xrpcomp
$(SED) -e 's|%LIBEXECDIR%|$(libexecdir)|' $(srcdir)/xrpcomp > xrpcomp.tmp
install-local: $(PROGRAMS) FORCE
- -$(MKDIR) $(libexecdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 rp500 $(libexecdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 fax500 $(libexecdir)
- $(INSTALL) $(INSTALLFLAGS) -m 755 xrpcomp.tmp $(libexecdir)/xrpcomp
+ -$(MKDIR) $(DESTDIR)$(libexecdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 rp500 $(DESTDIR)$(libexecdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 fax500 $(DESTDIR)$(libexecdir)
+ $(INSTALL) $(INSTALLFLAGS) -m 755 xrpcomp.tmp $(DESTDIR)$(libexecdir)/xrpcomp
diff --git a/clients/finger/Makefile.in b/clients/finger/Makefile.in
index 613bda9e409e7440cc4b1f5ccce84418cce6b7b9..2192c2b531ff65220d0f3c01cdb6f84fa37d95b0 100644
--- a/clients/finger/Makefile.in
+++ b/clients/finger/Makefile.in
@@ -19,5 +19,5 @@ version.c: ${OBJS} ${LDAP_LIBDEPEND}
$(MKVERSION) in.xfingerd > $@
install-local: $(PROGRAMS) FORCE
- -$(MKDIR) $(libexecdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 in.xfingerd $(libexecdir)
+ -$(MKDIR) $(DESTDIR)$(libexecdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 in.xfingerd $(DESTDIR)$(libexecdir)
diff --git a/clients/gopher/Makefile.in b/clients/gopher/Makefile.in
index a9d5e4ee949c4f889f3aac17290ae93f7167a745..5022e50ba827121858eecf956e4aecb63eec9304 100644
--- a/clients/gopher/Makefile.in
+++ b/clients/gopher/Makefile.in
@@ -30,8 +30,8 @@ gwversion.c: ${GWOBJS} $(LDAP_LIBDEPEND)
$(MKVERSION) go500gw > $@
install-local: $(PROGRAMS) go500gw.help FORCE
- -$(MKDIR) $(libexecdir) $(datadir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 go500 $(libexecdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 go500gw $(libexecdir)
- -$(MV) $(datadir)/go500gw.help $(datadir)/go500gw.help-
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/go500gw.help $(datadir)
+ -$(MKDIR) $(DESTDIR)$(libexecdir) $(DESTDIR)$(datadir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 go500 $(DESTDIR)$(libexecdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 go500gw $(DESTDIR)$(libexecdir)
+ -$(MV) $(DESTDIR)$(datadir)/go500gw.help $(DESTDIR)$(datadir)/go500gw.help-
+ $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/go500gw.help $(DESTDIR)$(datadir)
diff --git a/clients/mail500/Makefile.in b/clients/mail500/Makefile.in
index 38b61fd40486f51b193e893b8a1d8737711def70..4cfb4d7281c52254f6195d6df190510d3e71be86 100644
--- a/clients/mail500/Makefile.in
+++ b/clients/mail500/Makefile.in
@@ -20,5 +20,5 @@ version.c: ${OBJS} $(LDAP_LIBDEPEND)
$(MKVERSION) mail500 > $@
install-local: $(PROGRAMS) FORCE
- -$(MKDIR) $(libexecdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 mail500 $(libexecdir)
+ -$(MKDIR) $(DESTDIR)$(libexecdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 mail500 $(DESTDIR)$(libexecdir)
diff --git a/clients/rcpt500/Makefile.in b/clients/rcpt500/Makefile.in
index 5af6536f915447af999b9f5ea226e3a01989e691..d8809107de44cab55fb316df982aea5119e6d557 100644
--- a/clients/rcpt500/Makefile.in
+++ b/clients/rcpt500/Makefile.in
@@ -20,7 +20,7 @@ version.c: ${OBJS} $(LDAP_LIBDEPEND)
$(MKVERSION) rcpt500 > $@
install-local: $(PROGRAMS) rcpt500.help FORCE
- -$(MKDIR) $(libexecdir) $(datadir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(libexecdir)
- -$(MV) $(datadir)/rcpt500.help $(datadir)/rcpt500.help-
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/rcpt500.help $(datadir)
+ -$(MKDIR) $(DESTDIR)$(libexecdir) $(DESTDIR)$(datadir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(DESTDIR)$(libexecdir)
+ -$(MV) $(DESTDIR)$(datadir)/rcpt500.help $(DESTDIR)$(datadir)/rcpt500.help-
+ $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/rcpt500.help $(DESTDIR)$(datadir)
diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index 11acdd9cff0cb9d04c9c3d2b361837cca4cefd90..6012ce1677a3dd812718275fb12e4840f5b62c3b 100644
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -55,11 +55,11 @@ ldrversion.c: ldapmodrdn.o $(LDAP_LIBDEPEND)
$(MKVERSION) ldapmodrdn > $@
install-local: FORCE
- -$(MKDIR) $(bindir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapsearch $(bindir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapmodify $(bindir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapdelete $(bindir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapmodrdn $(bindir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldappasswd $(bindir)
- $(RM) $(bindir)/ldapadd$(EXEEXT)
- $(LN) $(bindir)/ldapmodify$(EXEEXT) $(bindir)/ldapadd$(EXEEXT)
+ -$(MKDIR) $(DESTDIR)$(bindir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapsearch $(DESTDIR)$(bindir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapmodify $(DESTDIR)$(bindir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapdelete $(DESTDIR)$(bindir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapmodrdn $(DESTDIR)$(bindir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldappasswd $(DESTDIR)$(bindir)
+ $(RM) $(DESTDIR)$(bindir)/ldapadd$(EXEEXT)
+ $(LN) ldapmodify$(EXEEXT) $(DESTDIR)$(bindir)/ldapadd$(EXEEXT)
diff --git a/clients/ud/Makefile.in b/clients/ud/Makefile.in
index 54c16e29e13ed6144c913d3288bd85c401fdd425..8af1f5a2afd5a9e59817387637c8358b17b4e25d 100644
--- a/clients/ud/Makefile.in
+++ b/clients/ud/Makefile.in
@@ -22,6 +22,6 @@ version.c: ${OBJS} $(LDAP_LIBDEPEND)
$(MKVERSION) -s -c -n Version UserDirectory > $@
install-local: FORCE
- -$(MKDIR) $(bindir)
- -mv -f $(bindir)/ud $(bindir)/ud-
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
+ -$(MKDIR) $(DESTDIR)$(bindir)
+ -mv -f $(DESTDIR)$(bindir)/ud $(DESTDIR)$(bindir)/ud-
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(DESTDIR)$(bindir)
diff --git a/contrib/ldaptcl/Makefile.in b/contrib/ldaptcl/Makefile.in
index c195b1b392f536d3b2967f27dbd89666e4999901..04586ff58ee95a52452a71b54e71470bf136a749 100644
--- a/contrib/ldaptcl/Makefile.in
+++ b/contrib/ldaptcl/Makefile.in
@@ -21,24 +21,24 @@ exec_prefix = @exec_prefix@
# The following definition can be set to non-null for special systems
# like AFS with replication. It allows the pathnames used for installation
# to be different than those used for actually reference files at
-# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
+# run-time. DESTDIR is prepended to $prefix and $exec_prefix
# when installing files.
-INSTALL_ROOT =
+DESTDIR =
# Directory in which to search for tcl libraries
NEO_LIBRARY = $(exec_prefix)/lib/ldaptcl$(VERSION)
# Directory in which to install the ldaptcl binary:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR = $(DESTDIR)$(exec_prefix)/bin
# Directory in which to install the .a or .so binary for the Neo library:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(DESTDIR)$(exec_prefix)/lib
# Path to use at runtime to refer to LIB_INSTALL_DIR:
LIB_RUNTIME_DIR = $(exec_prefix)/lib
# Top-level directory for man entries:
-MANN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann
+MANN_INSTALL_DIR = $(DESTDIR)$(prefix)/man/mann
# The symbols below provide support for dynamic loading and shared
diff --git a/contrib/saucer/Makefile.in b/contrib/saucer/Makefile.in
index 3d5479968b1d4a1eb48a5812bd9237781d70c36a..ca810b5672a2780961b8e45ca42f2ae460d7815f 100644
--- a/contrib/saucer/Makefile.in
+++ b/contrib/saucer/Makefile.in
@@ -17,7 +17,7 @@ saucer: ${OBJS} $(LDAP_LIBDEPEND)
$(LTLINK) -o $@ $(OBJS) $(LIBS)
install-local: $(PROGRAMS) FORCE
- -$(MKDIR) $(bindir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 saucer $(bindir)
- -test -d $(MANDIR) || $(MKDIR) $(mandir) $(MANDIR)
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/saucer.1 $(MANDIR)/saucer.1
+ -$(MKDIR) $(DESTDIR)$(bindir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 saucer $(DESTDIR)$(bindir)
+ -$(MKDIR) $(DESTDIR)$(MANDIR)
+ $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/saucer.1 $(DESTDIR)$(MANDIR)/saucer.1
diff --git a/contrib/web_ldap/Makefile.in b/contrib/web_ldap/Makefile.in
index 0157d0f452cf84132739f6ce67eb2abf29240708..1b3d64f47d0c5bf3f5dd951477e9ab57be29b181 100644
--- a/contrib/web_ldap/Makefile.in
+++ b/contrib/web_ldap/Makefile.in
@@ -13,6 +13,6 @@ web_ldap: ${OBJS} $(LDAP_LIBDEPEND)
$(LTLINK) -o $@ $(OBJS) $(LIBS)
install-local: $(PROGRAMS) FORCE
- -test -d $(libexecdir) || $(MKDIR) $(libexecdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 web_ldap $(libexecdir)
+ -$(MKDIR) $(DESTDIR)$(libexecdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 web_ldap $(DESTDIR)$(libexecdir)
@echo ">> You must copy and edit web_ldap.cfg and web_ldap.html as needed. <<"
diff --git a/contrib/whois++/Makefile b/contrib/whois++/Makefile
index d5e5af0536a87245c0ed414bd84ec1d5c23be2eb..f7995036ea50d8b15336eb9e204fe3a23f869da2 100644
--- a/contrib/whois++/Makefile
+++ b/contrib/whois++/Makefile
@@ -60,16 +60,17 @@ whois++.o: whois++.c $(HDRS)
install: inst-whois++
-inst-whois++: $(ETCDIR)/whois++d
- -mkdir -p $(CONFIG_DIRECTORY)
- cp -r templates $(CONFIG_DIRECTORY)
- -mkdir -p $(HELP_DIRECTORY)
- cp -r helpfiles/* $(HELP_DIRECTORY)
- sed -e 's#ETCDIR#$(ETCDIR)#' whois++d.man > $(MANDIR)/man$(MANSEC)/whois++d.$(MANSEC)
+inst-whois++: $(DESTDIR)$(ETCDIR)/whois++d
+ -$(MKDIR) $(DESTDIR)$(CONFIG_DIRECTORY)
+ cp -r templates $(DESTDIR)$(CONFIG_DIRECTORY)
+ -$(MKDIR) $(DESTDIR)$(HELP_DIRECTORY)
+ cp -r helpfiles/* $(DESTDIR)$(HELP_DIRECTORY)
+ -$(MKDIR) $(DESTDIR)$(DESTDIR)$(MANDIR)/man$(MANSEC)
+ sed -e 's#ETCDIR#$(ETCDIR)#' whois++d.man > $(DESTDIR)$(MANDIR)/man$(MANSEC)/whois++d.$(MANSEC)
@echo "Don't forget to modify and install the tailor file"
-$(ETCDIR)/whois++d: whois++d
- install -c -m 755 whois++d $(ETCDIR)
+$(DESTDIR)$(ETCDIR)/whois++d: whois++d
+ install -c -m 755 whois++d $(DESTDIR)$(ETCDIR)
lint:;
lint $(SRCS)
diff --git a/include/Makefile.in b/include/Makefile.in
index a3342c6a58aef038fcbe656e961cf9dfab196cc0..1c89d0f71fc57f3681a752887228a315be4d7261 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -7,15 +7,12 @@
all-local: ldap_config.h FORCE
install-local: FORCE
- -$(MKDIR) -p $(includedir)
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/lber.h $(includedir)
- $(INSTALL) $(INSTALLFLAGS) -m 644 lber_types.h $(includedir)
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldap.h $(includedir)
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldap_cdefs.h $(includedir)
- $(INSTALL) $(INSTALLFLAGS) -m 644 ldap_features.h $(includedir)
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldap_schema.h $(includedir)
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/disptmpl.h $(includedir)
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/srchpref.h $(includedir)
+ -$(MKDIR) $(DESTDIR)$(includedir)
+ for header in $(srcdir)/lber.h lber_types.h $(srcdir)/ldap.h \
+ $(srcdir)/ldap_cdefs.h ldap_features.h $(srcdir)/ldap_schema.h \
+ $(srcdir)/disptmpl.h $(srcdir)/srchpref.h; do \
+ $(INSTALL) $(INSTALLFLAGS) -m 644 $$header $(DESTDIR)$(includedir); \
+ done
clean-local: FORCE
$(RM) ldap_config.h
diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index 4808224b228b3829a58a5a6c8a124be7a26b589a..33459b7a91af363266ff5a128e636015aa9df091 100644
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -30,6 +30,6 @@ idtest: $(LIBRARY) idtest.o
$(LTLINK) $(LDFLAGS) -o $@ idtest.o $(LIBS)
install-local: FORCE
- -$(MKDIR) $(libdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
+ -$(MKDIR) $(DESTDIR)$(libdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 1ee85ec934ca6569c50e67f477bd3faa4b6f97f0..f4cf68cd87734d7abdb224f80961d31e48eeb296 100644
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -44,20 +44,20 @@ ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf
install-local: $(CFFILES) FORCE
- -$(MKDIR) $(libdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
- -$(MKDIR) $(sysconfdir)
+ -$(MKDIR) $(DESTDIR)$(libdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
+ -$(MKDIR) $(DESTDIR)$(sysconfdir)
@for i in $(CFFILES); do \
- if test ! -f $(sysconfdir)/$$i; then \
+ if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
echo "installing $$i in $(sysconfdir)"; \
- echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i"; \
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i; \
+ echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i"; \
+ $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i; \
else \
echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
fi; \
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i.default; \
+ $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i.default; \
done
- -$(MKDIR) $(datadir)
- -$(MV) $(datadir)/ldapfriendly $(datadir)/ldapfriendly-
- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldapfriendly $(datadir)/ldapfriendly
+ -$(MKDIR) $(DESTDIR)$(datadir)
+ -$(MV) $(DESTDIR)$(datadir)/ldapfriendly $(DESTDIR)$(datadir)/ldapfriendly-
+ $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldapfriendly $(DESTDIR)$(datadir)/ldapfriendly
diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
index fba054ecb0ee7536afd0441c958ff3a3e9acbef3..47058146e9d7c1edff8d6d7132444d7078f2a4a9 100644
--- a/libraries/libldap_r/Makefile.in
+++ b/libraries/libldap_r/Makefile.in
@@ -61,5 +61,5 @@ ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
$(LTLINK) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
install-local: $(CFFILES) FORCE
- -$(MKDIR) $(libdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
+ -$(MKDIR) $(DESTDIR)$(libdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in
index 57ff20adde01793e19faf53edcba3d95b0615d65..9e4723dfc010f81b86f7e6a67276852bd1d4b115 100644
--- a/servers/ldapd/Makefile.in
+++ b/servers/ldapd/Makefile.in
@@ -48,5 +48,5 @@ LDAP_tables.c: ldap.py
LDAP-types.h: LDAP_tables.c
install-local-srv: FORCE
- @-$(MKDIR) $(libexecdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapd $(libexecdir)
+ -$(MKDIR) $(DESTDIR)$(libexecdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapd $(DESTDIR)$(libexecdir)
diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index c589cf26c9164a57779730a8d2f14face5f276d0..61eb507b3eac0fdfcdb35e6388867102e33b8c2c 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -113,9 +113,9 @@ veryclean-local-srv: FORCE
install-local-srv: install-slapd install-conf install-tools
install-slapd: FORCE
- @-$(MKDIR) $(libexecdir)
- @-$(MKDIR) $(localstatedir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 slapd $(libexecdir)
+ -$(MKDIR) $(DESTDIR)$(libexecdir)
+ -$(MKDIR) $(DESTDIR)$(localstatedir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 slapd $(DESTDIR)$(libexecdir)
@if [ ! -z "$(SLAPD_MODULES)" ]; then \
for i in back-* shell-backends tools; do \
if [ -d $$i ]; then \
@@ -138,7 +138,7 @@ all-cffiles: slapd
touch all-cffiles
install-conf: FORCE
- @-$(MKDIR) $(sysconfdir)
+ @-$(MKDIR) $(DESTDIR)$(sysconfdir)
@for i in $(CFFILES); do \
tmpcf=$$i.tmp ; \
if test $$i = slapd.conf ; then \
@@ -146,17 +146,17 @@ install-conf: FORCE
else \
mode=644 ; \
fi ; \
- if test ! -f $(sysconfdir)/$$i; then \
+ if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
echo "installing $$i in $(sysconfdir)"; \
- echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i"; \
- $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i; \
+ echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$i"; \
+ $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$i; \
else \
- echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
+ echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/$$i" ; \
fi; \
- $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i.default ; \
+ $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$i.default ; \
done
install-tools: FORCE
- @-$(MKDIR) $(sbindir)
+ @-$(MKDIR) $(DESTDIR)$(sbindir)
(cd tools; $(MAKE) $(MFLAGS) install)
diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index 5e6c8719ffb00761c615076bf7bdd04c459baa82..31fc81a2476bfdc858aec8e5dab151e24feae636 100644
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -142,17 +142,16 @@ install-local: install-ldbm-$(BUILD_LDBM) install-bdb2-$(BUILD_BDB2) \
install-ldbm-no install-bdb2-no install-quipu-no:
install-ldbm-yes install-ldbm-mod: FORCE
- @-$(MKDIR) $(sbindir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 slapadd $(sbindir) ; \
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 slapcat $(sbindir) ; \
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 slapindex $(sbindir) ; \
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif $(sbindir) ; \
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 centipede $(sbindir)
+ -$(MKDIR) $(DESTDIR)$(sbindir)
+ for bin in slapadd slapcat slapindex centipede ldif; do \
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $$bin $(DESTDIR)$(sbindir); \
+ done
install-bdb2-yes install-bdb2-mod: FORCE
- @-$(MKDIR) $(sbindir)
+ @-$(MKDIR) $(DESTDIR)$(sbindir)
install-quipu-yes: FORCE
- @-$(MKDIR) $(sbindir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(sbindir); \
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(sbindir)
+ @-$(MKDIR) $(DESTDIR)$(sbindir)
+ for bin in edb2ldif chlog2replog; do \
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $$bin $(DESTDIR)$(sbindir); \
+ done
diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in
index 3b244dace5d5cea7afc430f8a18952442f0149f4..8d5951637e54bec1e7f42d952ee28b5aa4871fcf 100644
--- a/servers/slurpd/Makefile.in
+++ b/servers/slurpd/Makefile.in
@@ -40,5 +40,5 @@ version.c: $(OBJS) $(LDAP_LIBDEPEND) $(LDAP_LIBTHREAD_DEPEND)
$(MKVERSION) slurpd > $@
install-local-srv: FORCE
- @-$(MKDIR) $(libexecdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 755 slurpd $(libexecdir)
+ -$(MKDIR) $(DESTDIR)$(libexecdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 slurpd $(DESTDIR)$(libexecdir)