diff options
| author | Ramiro Polla <ramiro@lisha.ufsc.br> | 2007-01-25 12:29:48 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-01-25 12:29:48 +0000 |
| commit | ca3798dc2213536498ac1d75637c3da8aea2d3c4 (patch) | |
| tree | bc240c960ff05b105cc41b38907bdf957beaddd9 | |
| parent | 7a7be126632475356b16547d41824891b6b08aeb (diff) | |
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
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | common.mak | 4 | ||||
| -rwxr-xr-x | configure | 5 |
3 files changed, 3 insertions, 8 deletions
@@ -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)" && \ @@ -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 |