[Pkg-sysvinit-commits] r1416 - in sysvinit-upstream/trunk: doc src

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-10 19:41:54 +0000 (Fri, 10 Jul 2009)
New Revision: 1416

Modified:
   sysvinit-upstream/trunk/doc/Changelog
   sysvinit-upstream/trunk/src/Makefile
Log:
Adjust build rules to make sure the installed binaries are stripped.


Modified: sysvinit-upstream/trunk/doc/Changelog
===================================================================
--- sysvinit-upstream/trunk/doc/Changelog	2009-07-10 19:38:08 UTC (rev 1415)
+++ sysvinit-upstream/trunk/doc/Changelog	2009-07-10 19:41:54 UTC (rev 1416)
@@ -16,6 +16,8 @@
   * Add new option -F to last, to output full date string instead
     of the short form provided by default.  Patch from Olaf Dabrunz
     and SuSe.
+  * Adjust build rules to make sure the installed binaries
+    are stripped.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 30 Jul 2004 14:14:58 +0200
 

Modified: sysvinit-upstream/trunk/src/Makefile
===================================================================
--- sysvinit-upstream/trunk/src/Makefile	2009-07-10 19:38:08 UTC (rev 1415)
+++ sysvinit-upstream/trunk/src/Makefile	2009-07-10 19:41:54 UTC (rev 1416)
@@ -46,7 +46,9 @@
 BIN_OWNER	= root
 BIN_GROUP	= root
 BIN_COMBO	= $(BIN_OWNER):$(BIN_GROUP)
-INSTALL		= install -o $(BIN_OWNER) -g $(BIN_GROUP)
+STRIP		= strip -s -R .comment
+INSTALL_EXEC	= install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 755
+INSTALL_DATA	= install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 644
 MANDIR		= /usr/share/man
 
 # Additional libs for GNU libc.
@@ -111,15 +113,18 @@
 
 install:
 		for i in $(BIN); do \
-			$(INSTALL) -m 755 $$i $(ROOT)/bin/; \
+			$(STRIP) $$i ; \
+			$(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
 		done
 		for i in $(SBIN); do \
-			$(INSTALL) -m 755 $$i $(ROOT)/sbin/; \
+			$(STRIP) $$i ; \
+			$(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \
 		done
 		for i in $(USRBIN); do \
-			$(INSTALL) -m 755 $$i $(ROOT)/usr/bin/; \
+			$(STRIP) $$i ; \
+			$(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \
 		done
-		# $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc/
+		# $(INSTALL_EXEC) etc/initscript.sample $(ROOT)/etc/
 		ln -sf halt $(ROOT)/sbin/reboot
 		ln -sf halt $(ROOT)/sbin/poweroff
 		ln -sf init $(ROOT)/sbin/telinit
@@ -127,15 +132,15 @@
 		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
 			ln -sf last $(ROOT)/usr/bin/lastb; \
 		fi
-		$(INSTALL) -m 644 initreq.h $(ROOT)/usr/include/
+		$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
 		for i in $(MAN1); do \
-			$(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/; \
+			$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \
 		done
 		for i in $(MAN5); do \
-			$(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man5/; \
+			$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man5/; \
 		done
 		for i in $(MAN8); do \
-			$(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man8/; \
+			$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man8/; \
 		done
 ifeq ($(ROOT),)
 		#