From 34edec3107b3a075d31d917e654f650c38ef19dc Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 30 May 2000 18:23:56 +0000
Subject: [PATCH] Strip installed executables better library clean

---
 build/lib.mk                    | 5 ++---
 clients/fax500/Makefile.in      | 4 ++--
 clients/finger/Makefile.in      | 2 +-
 clients/gopher/Makefile.in      | 2 +-
 clients/mail500/Makefile.in     | 2 +-
 clients/rcpt500/Makefile.in     | 2 +-
 clients/tools/Makefile.in       | 2 +-
 clients/ud/Makefile.in          | 2 +-
 servers/ldapd/Makefile.in       | 2 +-
 servers/slapd/Makefile.in       | 4 ++--
 servers/slapd/tools/Makefile.in | 7 ++++---
 servers/slurpd/Makefile.in      | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/build/lib.mk b/build/lib.mk
index 036b9d4da8..b647665842 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -24,9 +24,8 @@ lint5: lint5-local FORCE
 clean-common: 	FORCE
 	$(RM) $(LIBRARY) ../$(LIBRARY) $(XLIBRARY) \
 		$(PROGRAMS) $(XPROGRAMS) $(XSRCS) $(XXSRCS) \
-		*.o *.lo a.out core version.c .libs/* \
-		../`$(BASENAME) $(LIBRARY) .la`.so* \
-		../`$(BASENAME) $(LIBRARY) .la`*.dll *.exe
+		*.o *.lo a.out *.exe core version.c .libs/* \
+		../`$(BASENAME) $(LIBRARY) .la`{.a,.so*,*.dll}
 
 depend-common: FORCE
 	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS)
diff --git a/clients/fax500/Makefile.in b/clients/fax500/Makefile.in
index 7b706f34d5..eefd45123c 100644
--- a/clients/fax500/Makefile.in
+++ b/clients/fax500/Makefile.in
@@ -37,9 +37,9 @@ install-local: $(PROGRAMS) FORCE
 	-$(MKDIR) $(DESTDIR)$(libexecdir)
 	@(								\
 	    for prg in $(EXEPRGS); do					\
-		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT)	\
+		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT)	\
 		    $(DESTDIR)$(libexecdir);				\
 	    done							\
 	)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 xrpcomp.tmp	\
+	$(INSTALL_SCRIPT) $(INSTALLFLAGS) xrpcomp.tmp	\
 		$(DESTDIR)$(libexecdir)/xrpcomp
diff --git a/clients/finger/Makefile.in b/clients/finger/Makefile.in
index ce71dc9e0d..5a5d7fc3ea 100644
--- a/clients/finger/Makefile.in
+++ b/clients/finger/Makefile.in
@@ -24,7 +24,7 @@ install-local: $(PROGRAMS) FORCE
 	-$(MKDIR) $(DESTDIR)$(libexecdir)
 	@(								\
 	    for prg in $(PROGRAMS); do					\
-		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT)	\
+		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT)	\
 		    $(DESTDIR)$(libexecdir);				\
 	    done							\
 	)
diff --git a/clients/gopher/Makefile.in b/clients/gopher/Makefile.in
index aeecb64d90..27e2ba136a 100644
--- a/clients/gopher/Makefile.in
+++ b/clients/gopher/Makefile.in
@@ -36,7 +36,7 @@ install-local: $(PROGRAMS) go500gw.help FORCE
 	-$(MKDIR) $(DESTDIR)$(libexecdir) $(DESTDIR)$(datadir)
 	@(								\
 	    for prg in $(PROGRAMS); do					\
-		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT)	\
+		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT)	\
 		    $(DESTDIR)$(libexecdir);				\
 	    done							\
 	)
diff --git a/clients/mail500/Makefile.in b/clients/mail500/Makefile.in
index 337cb38f3f..260fefcae9 100644
--- a/clients/mail500/Makefile.in
+++ b/clients/mail500/Makefile.in
@@ -24,7 +24,7 @@ install-local: $(PROGRAMS) FORCE
 	-$(MKDIR) $(DESTDIR)$(libexecdir)
 	@(								\
 	    for prg in $(PROGRAMS); do					\
-		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT)	\
+		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT)	\
 		    $(DESTDIR)$(libexecdir);				\
 	    done							\
 	)
diff --git a/clients/rcpt500/Makefile.in b/clients/rcpt500/Makefile.in
index a1919f84b1..f0e60b5c0e 100644
--- a/clients/rcpt500/Makefile.in
+++ b/clients/rcpt500/Makefile.in
@@ -25,7 +25,7 @@ install-local: $(PROGRAMS) rcpt500.help FORCE
 	-$(MKDIR) $(DESTDIR)$(libexecdir) $(DESTDIR)$(datadir)
 	@(								\
 	    for prg in $(PROGRAMS); do					\
-		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT)	\
+		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT)	\
 		    $(DESTDIR)$(libexecdir);				\
 	    done							\
 	)
diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index d9f3e60ac4..ed54b4de99 100644
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -61,7 +61,7 @@ install-local:	FORCE
 	-$(MKDIR) $(DESTDIR)$(bindir)
 	@(								\
 	    for prg in $(PROGRAMS); do					\
-		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT)	\
+		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT)	\
 		    $(DESTDIR)$(bindir);				\
 	    done							\
 	)
diff --git a/clients/ud/Makefile.in b/clients/ud/Makefile.in
index 6fa47d03ca..7c22affb6b 100644
--- a/clients/ud/Makefile.in
+++ b/clients/ud/Makefile.in
@@ -29,7 +29,7 @@ install-local: FORCE
 	-mv -f $(DESTDIR)$(bindir)/ud $(DESTDIR)$(bindir)/ud-
 	@(								\
 	    for prg in $(PROGRAMS); do					\
-		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT)	\
+		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT)	\
 		    $(DESTDIR)$(bindir);				\
 	    done							\
 	)
diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in
index 9e4723dfc0..951782667e 100644
--- a/servers/ldapd/Makefile.in
+++ b/servers/ldapd/Makefile.in
@@ -49,4 +49,4 @@ LDAP-types.h: LDAP_tables.c
 
 install-local-srv: FORCE
 	-$(MKDIR) $(DESTDIR)$(libexecdir)
-	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapd $(DESTDIR)$(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 ldapd $(DESTDIR)$(libexecdir)
diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index b5d4df2145..de642ccd4a 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -228,8 +228,8 @@ install-local-srv: install-slapd install-conf install-schema install-tools
 install-slapd: FORCE
 	-$(MKDIR) $(DESTDIR)$(libexecdir)
 	-$(MKDIR) $(DESTDIR)$(localstatedir)
-	$(LTINSTALL) $(INSTALLFLAGS) -m 755 slapd$(EXEEXT) \
-						$(DESTDIR)$(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
+		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
 	@if [ ! -z "$(SLAPD_MODULES)" ]; then \
 	    for i in back-* shell-backends tools; do \
 		if [ -d $$i ]; then \
diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index ece80d638e..0d4efed850 100644
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -159,8 +159,8 @@ install-ldbm-no install-bdb2-no install-quipu-no:
 install-ldbm-yes install-ldbm-mod: FORCE
 	-$(MKDIR) $(DESTDIR)$(sbindir) 
 	@for bin in $(PROGRAMS); do \
-		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$bin$(EXEEXT) \
-					    	    $(DESTDIR)$(sbindir); \
+		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
+			$$bin$(EXEEXT) $(DESTDIR)$(sbindir); \
 	done
 
 install-bdb2-yes install-bdb2-mod: FORCE
@@ -169,5 +169,6 @@ install-bdb2-yes install-bdb2-mod: FORCE
 install-quipu-yes: FORCE
 	@-$(MKDIR) $(DESTDIR)$(sbindir)
 	for bin in edb2ldif chlog2replog; do \
-		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$bin $(DESTDIR)$(sbindir); \
+		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
+			$$bin $(DESTDIR)$(sbindir); \
 	done
diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in
index 17c7cd8246..6a1137eb16 100644
--- a/servers/slurpd/Makefile.in
+++ b/servers/slurpd/Makefile.in
@@ -47,7 +47,7 @@ install-local-srv: FORCE
 	-$(MKDIR) $(DESTDIR)$(libexecdir)
 	@(								\
 	    for prg in $(PROGRAMS); do					\
-		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT)	\
+		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT)	\
 		    $(DESTDIR)$(libexecdir);				\
 	    done							\
 	)
-- 
GitLab