SOURCES: ffmpeg-libtool.patch - fix install progs - skip ldconfig ...

[glen]

Author: glen                         Date: Wed Dec  6 00:02:01 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix install progs
- skip ldconfig if $DESTDIR is set

---- Files affected:
SOURCES:
   ffmpeg-libtool.patch (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SOURCES/ffmpeg-libtool.patch
diff -u SOURCES/ffmpeg-libtool.patch:1.17 SOURCES/ffmpeg-libtool.patch:1.18
--- SOURCES/ffmpeg-libtool.patch:1.17	Wed Dec  6 00:29:40 2006
+++ SOURCES/ffmpeg-libtool.patch	Wed Dec  6 01:01:56 2006
@@ -1,5 +1,5 @@
---- ffmpeg-export-2006-12-04/Makefile	2006-12-05 13:56:42.000000000 +0200
-+++ ffmpeg-export-2006-12-04/Makefile	2006-12-06 01:28:53.860990022 +0200
+--- ffmpeg-export-2006-12-04/Makefile	2006-12-06 01:28:53.860990022 +0200
++++ ffmpeg-export-2006-12-04/Makefile	2006-12-06 01:57:27.969598912 +0200
 @@ -13,7 +13,6 @@
  
  ifeq ($(CONFIG_FFMPEG),yes)
@@ -115,7 +115,7 @@
 -	install -c $(INSTALLSTRIP) -m 755 $(PROGS) "$(bindir)"
 +	install -d "$(DESTDIR)$(bindir)"
 +	for prog in $(PROGS); do \
-+		libtool --mode=install install -c $(INSTALLSTRIP) $(PROG) "$(DESTDIR)$(bindir)" \
++		libtool --mode=install install -c $(INSTALLSTRIP) $$prog "$(DESTDIR)$(bindir)"; \
 +	done
  
  # create the window installer
@@ -130,6 +130,15 @@
  
  install-vhook:
  	$(MAKE) -C vhook install
+@@ -144,7 +143,7 @@
+ endif
+ 
+ ifeq ($(BUILD_SHARED),yes)
+-	-$(LDCONFIG)
++	[ -n "$(DESTDIR)" ] || $(LDCONFIG)
+ endif
+ 
+ install-headers:
 @@ -159,10 +158,10 @@
  uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ffmpeg-libtool.patch?r1=1.17&r2=1.18&f=u