diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2005-03-16 19:11:58 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-03-16 19:11:58 +0000 |
| commit | cc973ecbe77ee6c273e2372ad24bb3aff0be5440 (patch) | |
| tree | 148c53e54ae68a49e82f934828e66640d7cf6382 /libavcodec | |
| parent | 0e1ceacde98f912de8604ea7ebe321a1790bd4b6 (diff) | |
| download | ffmpeg-cc973ecbe77ee6c273e2372ad24bb3aff0be5440.tar.gz | |
add libdir support to configure patch by (Luca Barbato )lu_zero gentoo org)
Originally committed as revision 4050 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 8 | ||||
| -rw-r--r-- | libavcodec/libpostproc/Makefile | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9a9e770095..c15e2761c4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -302,9 +302,9 @@ install: all install-headers ifeq ($(CONFIG_WIN32),yes) install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)" else - install -d $(prefix)/lib - install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so - ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so + install -d $(libdir) + install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so + ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so ldconfig || true endif ifeq ($(CONFIG_PP),yes) @@ -315,7 +315,7 @@ install: endif installlib: all install-headers - install -m 644 $(LIB) "$(prefix)/lib" + install -m 644 $(LIB) "$(libdir)" install-headers: mkdir -p "$(prefix)/include/ffmpeg" diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile index 87a118a8ea..ae1c9d8ca6 100644 --- a/libavcodec/libpostproc/Makefile +++ b/libavcodec/libpostproc/Makefile @@ -54,9 +54,9 @@ ifeq ($(SHARED_PP),yes) ifeq ($(CONFIG_WIN32),yes) install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)" else - install -d $(prefix)/lib - install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION) - ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB) + install -d $(libdir) + install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION) + ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB) ldconfig || true endif endif |