Commit 73bab97f authored by michaelni's avatar michaelni

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@852 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f25a737f
...@@ -60,6 +60,7 @@ ffplay: ffmpeg$(EXE) ...@@ -60,6 +60,7 @@ ffplay: ffmpeg$(EXE)
install: all install: all
$(MAKE) -C libavcodec install $(MAKE) -C libavcodec install
install -d $(prefix)/bin
install -s -m 755 $(PROG) $(prefix)/bin install -s -m 755 $(PROG) $(prefix)/bin
ln -sf ffmpeg $(prefix)/bin/ffplay ln -sf ffmpeg $(prefix)/bin/ffplay
......
...@@ -134,9 +134,10 @@ motion-test: motion_test.o $(LIB) ...@@ -134,9 +134,10 @@ motion-test: motion_test.o $(LIB)
install: all install: all
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
install -d $(prefix)/lib
install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
ln -sf $(prefix)/lib/libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
ldconfig ldconfig || true
mkdir -p $(prefix)/include/ffmpeg mkdir -p $(prefix)/include/ffmpeg
install -m 644 avcodec.h $(prefix)/include/ffmpeg/avcodec.h install -m 644 avcodec.h $(prefix)/include/ffmpeg/avcodec.h
install -m 644 common.h $(prefix)/include/ffmpeg/common.h install -m 644 common.h $(prefix)/include/ffmpeg/common.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment