patch by (Volker Moell <volker-ml at die-moells dot de>)

  creating $(prefix)/bin and $(prefix)/lib
  improved linking libavcodec.so -> libavcodec-$(VERSION).so
  ldconfig does not rise an error on not beeing root when installing

Originally committed as revision 852 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 86a4053..41ef2af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,7 @@ ffplay: ffmpeg$(EXE)
 
 install: all
        $(MAKE) -C libavcodec install
+       install -d $(prefix)/bin
        install -s -m 755 $(PROG) $(prefix)/bin
        ln -sf ffmpeg $(prefix)/bin/ffplay 
 

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 9c3c152..05072ca 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -134,9 +134,10 @@ motion-test: motion_test.o $(LIB)
 
 install: all
 ifeq ($(BUILD_SHARED),yes)
+       install -d $(prefix)/lib
        install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
-       ln -sf $(prefix)/lib/libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
-       ldconfig
+       ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
+       ldconfig || true
        mkdir -p $(prefix)/include/ffmpeg
        install -m 644 avcodec.h $(prefix)/include/ffmpeg/avcodec.h
        install -m 644 common.h $(prefix)/include/ffmpeg/common.h