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
This commit is contained in:
committed by
Michael Niedermayer
parent
1359c2d43e
commit
c1325d18ff
1
Makefile
1
Makefile
@@ -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)
|
|||||||
|
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user