From c1325d18fff570a1a7a1845a876271b99534a5af Mon Sep 17 00:00:00 2001
From: Volker Moell <volker-ml@die-moells.de>
Date: Tue, 13 Aug 2002 18:51:11 +0000
Subject: [PATCH] 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
---
 Makefile            | 1 +
 libavcodec/Makefile | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 86a4053..41ef2af 100644
--- 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
--- 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
-- 
2.7.4