[patch] ffmpeg diff

ffmpeg-0.4.6.20030304-Makefiles.diff (text/plain), 3.59 KB, created by Derk-Jan Hartman on 2003-05-04 15:51:36 UTC

diff -urN ../ffmpeg-cvs-2003-03-04.orig/Makefile ./Makefile
--- ../ffmpeg-cvs-2003-03-04.orig/Makefile	2003-05-04 19:14:49.000000000 +0200
+++ ./Makefile	2003-05-04 19:19:12.000000000 +0200
@@ -84,20 +84,18 @@
 	$(MAKE) -C vhook all
 
 install: all $(INSTALLVHOOK)
-	$(MAKE) -C libavcodec install
-	install -d $(prefix)/bin
-	install -c -s -m 755 $(PROG) $(prefix)/bin
-	ln -sf ffmpeg $(prefix)/bin/ffplay 
+	$(MAKE) -C libavcodec DESTDIR=$(DESTDIR) install
+	install -d $(DESTDIR)$(prefix)/bin
+	install -s -m 755 $(PROG) $(DESTDIR)$(prefix)/bin
+	$(MAKE) -C libavcodec DESTDIR=$(DESTDIR) installlib
+	$(MAKE) -C libavformat DESTDIR=$(DESTDIR) installlib
 
-install-vhook: $(prefix)/lib/vhook
-	$(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
-
-$(prefix)/lib/vhook:
-	install -d $@
+install-vhook:
+	$(MAKE) -C vhook install INSTDIR=$(DESTDIR)$(prefix)/lib/vhook
 
 installlib:
-	$(MAKE) -C libavcodec installlib
-	$(MAKE) -C libavformat installlib
+	$(MAKE) -C libavcodec DESTDIR=$(DESTDIR) installlib
+	$(MAKE) -C libavformat DESTDIR=$(DESTDIR) installlib
 
 dep:	depend
 
diff -urN ../ffmpeg-cvs-2003-03-04.orig/libavcodec/Makefile ./libavcodec/Makefile
--- ../ffmpeg-cvs-2003-03-04.orig/libavcodec/Makefile	2003-05-04 19:14:49.000000000 +0200
+++ ./libavcodec/Makefile	2003-05-04 19:16:30.000000000 +0200
@@ -197,20 +197,18 @@
 
 install: all
 ifeq ($(BUILD_SHARED),yes)
-	install -d $(prefix)/lib
-	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
-	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
-	ldconfig || true
-	mkdir -p $(prefix)/include/ffmpeg
-	install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h
-	install -m 644 $(VPATH)/common.h $(prefix)/include/ffmpeg/common.h
+	install -d $(DESTDIR)$(prefix)/lib
+	install -s -m 755 $(SLIB) $(DESTDIR)$(prefix)/lib/libavcodec-$(VERSION).so
+	install -d $(DESTDIR)$(prefix)/include/ffmpeg
+	install -m 644 $(VPATH)/avcodec.h $(DESTDIR)$(prefix)/include/ffmpeg/avcodec.h
+	install -m 644 $(VPATH)/common.h $(DESTDIR)$(prefix)/include/ffmpeg/common.h
 endif
 
 installlib: all
-	install -m 644 $(LIB) $(prefix)/lib
-	mkdir -p $(prefix)/include/ffmpeg
+	install -m 644 $(LIB) $(DESTDIR)$(prefix)/lib
+	install -d $(DESTDIR)$(prefix)/include/ffmpeg
 	install -m 644 $(SRC_PATH)/libavcodec/avcodec.h $(SRC_PATH)/libavcodec/common.h \
-                $(prefix)/include/ffmpeg
+                $(DESTDIR)$(prefix)/include/ffmpeg
 
 #
 # include dependency files if they exist
diff -urN ../ffmpeg-cvs-2003-03-04.orig/libavformat/Makefile ./libavformat/Makefile
--- ../ffmpeg-cvs-2003-03-04.orig/libavformat/Makefile	2003-05-04 19:14:49.000000000 +0200
+++ ./libavformat/Makefile	2003-05-04 19:16:30.000000000 +0200
@@ -75,12 +75,12 @@
 	$(CC) -MM $(CFLAGS) $^ 1>.depend
 
 installlib: all
-	install -m 644 $(LIB) $(prefix)/lib
-	mkdir -p $(prefix)/include/ffmpeg
+	install -m 644 $(LIB) $(DESTDIR)$(prefix)/lib
+	install -d $(DESTDIR)$(prefix)/include/ffmpeg
 	install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
                 $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
                 $(SRC_PATH)/libavformat/rtspcodes.h \
-                $(prefix)/include/ffmpeg
+                $(DESTDIR)$(prefix)/include/ffmpeg
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $< 
diff -urN ../ffmpeg-cvs-2003-03-04.orig/vhook/Makefile ./vhook/Makefile
--- ../ffmpeg-cvs-2003-03-04.orig/vhook/Makefile	2003-05-04 19:14:49.000000000 +0200
+++ ./vhook/Makefile	2003-05-04 19:16:30.000000000 +0200
@@ -26,6 +26,7 @@
 	$(CC) -MM $(CFLAGS) $^ 1>.depend
 
 install:
+	install -d $(INSTDIR)
 	install -s -m 755 $(HOOKS) $(INSTDIR)
 
 imlib2.so: imlib2.o