Add support for "make install-strip".

11 files changed, 60 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index db76cf2..0d21289 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2009-01-17  Bruno Haible  <bruno@clisp.org>
 
+	Add support for "make install-strip".
+	* configure.ac: Search for 'strip'. Invoke AM_PROG_INSTALL_STRIP.
+	* Makefile.in (install-strip): New rule.
+	* src/Makefile.in (STRIP, INSTALL_STRIP_PROGRAM, install_sh): New variables.
+	(install-strip): New rule.
+	* lib/Makefile.in (install-strip): New target.
+	* preload/Makefile.in (install-strip): Likewise.
+	* man/Makefile.in (install-strip): Likewise.
+	Reported by Alon Bar-Lev <alon.barlev@gmail.com>.
+
+2009-01-17  Bruno Haible  <bruno@clisp.org>
+
 	Update after gnulib changed.
 	* src/Makefile.in (RELOCATABLE_STRIP): New variable.
 
diff --git a/Makefile.in b/Makefile.in
index 7745cd1..8168cad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,6 +59,17 @@ install : lib/localcharset.h force
 	cd po && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
 	cd man && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)' mandir='$(mandir)'
 
+install-strip : lib/localcharset.h force
+	cd libcharset && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+	cd lib && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+	cd preload && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+	cd srclib && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+	cd src && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+	if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
+	$(INSTALL_DATA) include/iconv.h.inst $(DESTDIR)$(includedir)/iconv.h
+	cd po && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
+	cd man && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)' mandir='$(mandir)'
+
 installdirs : force
 	cd libcharset && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
 	cd lib && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
diff --git a/configure.ac b/configure.ac
index 015dba8..ad7c169 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,10 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
+AC_PATH_PROG([STRIP], [strip], [:]) dnl sets STRIP
+AM_PROG_INSTALL_STRIP               dnl overrides STRIP when cross-compiling,
+                                    dnl sets INSTALL_STRIP_PROGRAM
+
 dnl           check for host type
 
 AC_CANONICAL_HOST
diff --git a/lib/Makefile.in b/lib/Makefile.in
index f584ba7..c1e7a54 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -112,6 +112,8 @@ install : all force
 	         mv -f libiconv.new.a libiconv.a) ;; \
 	esac
 
+install-strip : install
+
 installdirs : force
 	if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi
 
diff --git a/libcharset/ChangeLog b/libcharset/ChangeLog
index 9c0cb62..8da903a 100644
--- a/libcharset/ChangeLog
+++ b/libcharset/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-16  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.in (install-strip): New target.
+	Reported by Alon Bar-Lev <alon.barlev@gmail.com>.
+
 2009-01-14  Bruno Haible  <bruno@clisp.org>
 
 	* configure.ac: More consistent m4 quoting.
diff --git a/libcharset/Makefile.in b/libcharset/Makefile.in
index f62ed45..acdf3d4 100644
--- a/libcharset/Makefile.in
+++ b/libcharset/Makefile.in
@@ -51,6 +51,8 @@ install : include/libcharset.h include/localcharset.h force
 	$(INSTALL_DATA) include/libcharset.h $(DESTDIR)$(includedir)/libcharset.h
 	$(INSTALL_DATA) include/localcharset.h.inst $(DESTDIR)$(includedir)/localcharset.h
 
+install-strip : install
+
 installdirs : force
 	cd lib && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
 	$(mkinstalldirs) $(DESTDIR)$(includedir)
diff --git a/libcharset/lib/ChangeLog b/libcharset/lib/ChangeLog
index 76afc58..535e4e4 100644
--- a/libcharset/lib/ChangeLog
+++ b/libcharset/lib/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-16  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.in (install-strip): New target.
+	Reported by Alon Bar-Lev <alon.barlev@gmail.com>.
+
 2008-04-13  Bruno Haible  <bruno@clisp.org>
 
 	* localcharset.c (OS2): Don't redefine if already defined.
diff --git a/libcharset/lib/Makefile.in b/libcharset/lib/Makefile.in
index b491ae9..780f168 100644
--- a/libcharset/lib/Makefile.in
+++ b/libcharset/lib/Makefile.in
@@ -109,6 +109,8 @@ install : all force
 	  fi ; \
 	fi
 
+install-strip : install
+
 installdirs : force
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
 
diff --git a/man/Makefile.in b/man/Makefile.in
index 5358516..a05e7af 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -42,6 +42,8 @@ install : force
 	if [ ! -d $(DESTDIR)$(htmldir) ] ; then $(mkinstalldirs) $(DESTDIR)$(htmldir) ; fi
 	builddir="`pwd`"; cd $(srcdir) && for f in *.html ; do (cd "$$builddir"; echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f) ; done
 
+install-strip : install
+
 installdirs : force
 	if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; fi
 	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then $(mkinstalldirs) $(DESTDIR)$(mandir)/man3 ; fi
diff --git a/preload/Makefile.in b/preload/Makefile.in
index f2225ac..c2035d8 100644
--- a/preload/Makefile.in
+++ b/preload/Makefile.in
@@ -60,6 +60,8 @@ install : all force
 	if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi
 	if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(DESTDIR)$(libdir)/@PLUGLIB@.new && mv $(DESTDIR)$(libdir)/@PLUGLIB@.new $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi
 
+install-strip : install
+
 installdirs : force
 	if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 92c53cb..7af8a54 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -37,6 +37,11 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 mkinstalldirs = $(SHELL) @top_srcdir@/build-aux/mkinstalldirs
 
+# Programs used by "make install-strip":
+STRIP = @STRIP@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+install_sh = @install_sh@
+
 #### End of system configuration section. ####
 
 SHELL = /bin/sh
@@ -112,6 +117,14 @@ install : all force
 	esac
 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
 
+install-strip : force
+	case '$(INSTALL_PROGRAM)' in \
+	  */install-reloc) \
+	    $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' RELOCATABLE_STRIP='$(STRIP)' ;; \
+	  *) \
+	    $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' INSTALL_PROGRAM='$(INSTALL_STRIP_PROGRAM)' ;; \
+	esac
+
 installdirs : force
 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi