From ca3798dc2213536498ac1d75637c3da8aea2d3c4 Mon Sep 17 00:00:00 2001
From: Ramiro Polla <ramiro@lisha.ufsc.br>
Date: Thu, 25 Jan 2007 12:29:48 +0000
Subject: Remove installstrip in favor of explicit strip; better for
 cross-compilation. patch by Ramiro Ribeiro Polla, ramiro lisha.ufsc br

Originally committed as revision 7709 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Makefile   | 2 +-
 common.mak | 4 ++--
 configure  | 5 -----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index b2d75759e9..a4b0a37f6e 100644
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ else
 install-progs: $(PROGS)
 endif
 	install -d "$(bindir)"
-	install -c $(INSTALLSTRIP) -m 755 $(PROGS) "$(bindir)"
+	install -c -m 755 $(PROGS) "$(bindir)"
 
 # Create the Windows installer.
 wininstaller: all install
diff --git a/common.mak b/common.mak
index 0d5fdceec4..1a80833e87 100644
--- a/common.mak
+++ b/common.mak
@@ -63,8 +63,8 @@ install-libs: $(INSTLIBTARGETS)
 
 install-lib-shared: $(SLIBNAME)
 	install -d "$(shlibdir)"
-	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-		"$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+	install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+	$(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
 	cd "$(shlibdir)" && \
 		ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
 	cd "$(shlibdir)" && \
diff --git a/configure b/configure
index 0ab65a9e08..18aad8c22b 100755
--- a/configure
+++ b/configure
@@ -668,7 +668,6 @@ optimize="yes"
 debug="yes"
 extrawarnings="no"
 dostrip="yes"
-installstrip="-s"
 extralibs="-lm"
 bigendian="no"
 vhook="default"
@@ -810,7 +809,6 @@ dv1394="no"
 extralibs="-lpoll -lgnugetopt -lm"
 make="gmake"
 strip="strip -d"
-installstrip=""
 ;;
 Darwin)
 cc="cc"
@@ -823,7 +821,6 @@ SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNA
 VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@'
 extralibs=""
 strip="strip -x"
-installstrip=""
 FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
 SLIBSUF=".dylib"
 SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
@@ -1914,10 +1911,8 @@ echo "AR=$ar" >> config.mak
 echo "RANLIB=$ranlib" >> config.mak
 if test "$dostrip" = "yes" ; then
     echo "STRIP=$strip" >> config.mak
-    echo "INSTALLSTRIP=$installstrip" >> config.mak
 else
     echo "STRIP=echo ignoring strip" >> config.mak
-    echo "INSTALLSTRIP=" >> config.mak
 fi
 
 echo "OPTFLAGS=$CFLAGS" >> config.mak
-- 
cgit v1.2.3