SOURCES: ffmpeg-libtool.patch - DESTDIR fixes
glen
glen at pld-linux.org
Tue Dec 5 13:02:06 CET 2006
Author: glen Date: Tue Dec 5 12:02:06 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- DESTDIR fixes
---- Files affected:
SOURCES:
ffmpeg-libtool.patch (1.15 -> 1.16)
---- Diffs:
================================================================
Index: SOURCES/ffmpeg-libtool.patch
diff -u SOURCES/ffmpeg-libtool.patch:1.15 SOURCES/ffmpeg-libtool.patch:1.16
--- SOURCES/ffmpeg-libtool.patch:1.15 Tue Dec 5 12:41:48 2006
+++ SOURCES/ffmpeg-libtool.patch Tue Dec 5 13:02:00 2006
@@ -1,5 +1,5 @@
---- ffmpeg-export-2006-12-04/Makefile 2006-11-20 23:46:43.000000000 +0200
-+++ ffmpeg-export-2006-12-04.libtool2/Makefile 2006-12-05 13:08:44.141688603 +0200
+--- ffmpeg-export-2006-12-04.libtool2/Makefile 2006-12-05 13:08:44.141688603 +0200
++++ ffmpeg-export-2006-12-04/Makefile 2006-12-05 13:56:42.000000000 +0200
@@ -13,7 +13,6 @@
ifeq ($(CONFIG_FFMPEG),yes)
@@ -63,13 +63,13 @@
- $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
+libavformat/libavformat.la:
+ $(MAKE) -C libavformat all
-+
-+libavcodec/libavcodec.la:
-+ $(MAKE) -C libavcodec all
-%$(EXESUF): %_g$(EXESUF)
- cp -p $< $@
- $(STRIP) $@
++libavcodec/libavcodec.la:
++ $(MAKE) -C libavcodec all
++
+ffplay$(EXESUF): ffplay.lo cmdutils.lo
+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(SDL_LIBS)
@@ -107,6 +107,40 @@
$(MAKE) -C vhook all
documentation:
+@@ -118,16 +115,16 @@
+ else
+ install-progs: $(PROGS)
+ endif
+- install -d "$(bindir)"
+- install -c $(INSTALLSTRIP) -m 755 $(PROGS) "$(bindir)"
++ install -d "$(DESTDIR)$(bindir)"
++ install -c $(INSTALLSTRIP) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
+
+ # create the window installer
+ wininstaller: all install
+ makensis ffinstall.nsi
+
+ install-man:
+- install -d "$(mandir)/man1"
+- install -m 644 $(MANPAGES) "$(mandir)/man1"
++ install -d "$(DESTDIR)$(mandir)/man1"
++ install -m 644 $(MANPAGES) "$(DESTDIR)$(mandir)/man1"
+
+ install-vhook:
+ $(MAKE) -C vhook install
+@@ -159,10 +156,10 @@
+ uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
+
+ uninstall-progs:
+- rm -f $(addprefix $(bindir)/, $(ALLPROGS))
++ rm -f $(addprefix $(DESTDIR)$(bindir)/, $(ALLPROGS))
+
+ uninstall-man:
+- rm -f $(addprefix $(mandir)/man1/,$(ALLMANPAGES))
++ rm -f $(addprefix $(DESTDIR)$(mandir)/man1/,$(ALLMANPAGES))
+
+ uninstall-vhook:
+ $(MAKE) -C vhook uninstall
@@ -198,10 +195,6 @@
.depend: $(SRCS) version.h
$(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
@@ -127,8 +161,8 @@
output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(EXESUF)
distclean: clean
---- ffmpeg-export-2006-12-04/common.mak 2006-11-25 17:44:55.000000000 +0200
-+++ ffmpeg-export-2006-12-04.libtool2/common.mak 2006-12-05 13:08:44.141688603 +0200
+--- ffmpeg-export-2006-12-04.libtool2/common.mak 2006-12-05 13:08:44.141688603 +0200
++++ ffmpeg-export-2006-12-04/common.mak 2006-12-05 13:40:21.000000000 +0200
@@ -8,37 +8,30 @@
CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
@@ -180,10 +214,22 @@
depend dep: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -62,13 +55,8 @@
- install-libs: $(INSTLIBTARGETS)
+@@ -50,36 +43,17 @@
+ distclean: clean
+ rm -f .depend
+
+-ifeq ($(BUILD_SHARED),yes)
+-INSTLIBTARGETS += install-lib-shared
+-endif
+-ifeq ($(BUILD_STATIC),yes)
+-INSTLIBTARGETS += install-lib-static
+-endif
+-
+ install: install-libs install-headers
- install-lib-shared: $(SLIBNAME)
+-install-libs: $(INSTLIBTARGETS)
+-
+-install-lib-shared: $(SLIBNAME)
- install -d "$(shlibdir)"
- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
- "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
@@ -191,14 +237,15 @@
- ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
- cd "$(shlibdir)" && \
- ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
+-
+-install-lib-static: $(LIB)
+- install -d "$(libdir)"
+- install -m 644 $(LIB) "$(libdir)"
+- $(LIB_INSTALL_EXTRA_CMD)
++install-libs: $(SLIBNAME) $(LIB)
+ install -d $(DESTDIR)$(libdir)
+ libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
- install-lib-static: $(LIB)
- install -d "$(libdir)"
-@@ -76,10 +64,10 @@
- $(LIB_INSTALL_EXTRA_CMD)
-
install-headers:
- install -d "$(incdir)"
- install -d "$(libdir)/pkgconfig"
@@ -211,8 +258,8 @@
uninstall: uninstall-libs uninstall-headers
---- ffmpeg-export-2006-12-04/configure 2006-11-29 01:55:24.000000000 +0200
-+++ ffmpeg-export-2006-12-04.libtool2/configure 2006-12-05 13:08:44.141688603 +0200
+--- ffmpeg-export-2006-12-04.libtool2/configure 2006-12-05 13:08:44.141688603 +0200
++++ ffmpeg-export-2006-12-04/configure 2006-12-05 13:46:14.000000000 +0200
@@ -608,10 +608,10 @@
LDCONFIG="ldconfig"
LIBPREF="lib"
@@ -226,6 +273,25 @@
SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
EXESUF=""
+@@ -1776,12 +1776,12 @@
+ echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
+
+ echo "PREFIX=$PREFIX" >> config.mak
+-echo "prefix=\$(DESTDIR)\${PREFIX}" >> config.mak
+-echo "libdir=\$(DESTDIR)$libdir" >> config.mak
+-echo "shlibdir=\$(DESTDIR)$shlibdir" >> config.mak
+-echo "incdir=\$(DESTDIR)$incdir" >> config.mak
+-echo "bindir=\$(DESTDIR)$bindir" >> config.mak
+-echo "mandir=\$(DESTDIR)$mandir" >> config.mak
++echo "prefix=\${PREFIX}" >> config.mak
++echo "libdir=$libdir" >> config.mak
++echo "shlibdir=$shlibdir" >> config.mak
++echo "incdir=$incdir" >> config.mak
++echo "bindir=$bindir" >> config.mak
++echo "mandir=$mandir" >> config.mak
+ echo "MAKE=$make" >> config.mak
+ echo "CC=$cc" >> config.mak
+ echo "AR=$ar" >> config.mak
--- ffmpeg-export-2006-12-04/libavcodec/Makefile 2006-11-22 11:20:16.000000000 +0200
+++ ffmpeg-export-2006-12-04.libtool2/libavcodec/Makefile 2006-12-05 13:08:44.141688603 +0200
@@ -6,404 +6,403 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/ffmpeg-libtool.patch?r1=1.15&r2=1.16&f=u
More information about the pld-cvs-commit
mailing list