Create infrastructure to install shared and static libs into different places.

based on patch by Víctor Paesa wzrlpy at arsystel com

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5755 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/common.mak b/common.mak
index 75366e8ed960cc6cf01fcb9b2926f54b3bc0eb51..f06d3268a0990957b0d3b1faad870e29fdd97eb8 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -65,11 +65,11 @@ ifeq ($(CONFIG_MINGW),yes)
        install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
 else
        install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-               $(libdir)/$(SLIBNAME_WITH_VERSION)
+               $(shlibdir)/$(SLIBNAME_WITH_VERSION)
        ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(libdir)/$(SLIBNAME_WITH_MAJOR)
+               $(shlibdir)/$(SLIBNAME_WITH_MAJOR)
        ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(libdir)/$(SLIBNAME)
+               $(shlibdir)/$(SLIBNAME)
 endif
 
 install-lib-static: $(LIB)

diff --git a/configure b/configure
index eff8b7dc502e8a28c873820b672ebfacc18d5dbc..a8447cf1e3239a46f75535e017699b3d6c702c0c 100755 (executable)
--- a/configure
+++ b/configure
@@ -26,6 +26,7 @@ show_help(){
   echo "  --log[=FILE|yes|no]      log tests and output to FILE [config.err]"
   echo "  --prefix=PREFIX          install in PREFIX [$PREFIX]"
   echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
+  echo "  --shlibdir=DIR           install shared libs in DIR [PREFIX/lib]"
   echo "  --incdir=DIR             install includes in DIR [PREFIX/include/ffmpeg]"
   echo "  --mandir=DIR             install man page in DIR [PREFIX/man]"
   echo "  --enable-mp3lame         enable MP3 encoding via libmp3lame [default=no]"
@@ -324,6 +325,7 @@ logging="yes"
 logfile="config.err"
 PREFIX="/usr/local"
 libdir='${PREFIX}/lib'
+shlibdir="$libdir"
 incdir='${PREFIX}/include/ffmpeg'
 mandir='${PREFIX}/man'
 bindir='${PREFIX}/bin'
@@ -686,6 +688,8 @@ for opt do
   ;;
   --libdir=*) libdir="$optval"; force_libdir=yes
   ;;
+  --shlibdir=*) shlibdir="$optval"
+  ;;
   --incdir=*) incdir="$optval"
   ;;
   --mandir=*) mandir="$optval"
@@ -1558,6 +1562,7 @@ echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
 echo "PREFIX=$PREFIX" >> config.mak
 echo "prefix=\$(DESTDIR)\${PREFIX}" >> config.mak
 echo "libdir=\$(DESTDIR)$libdir" >> config.mak
+echo "shlibdir=\$(DESTDIR)$shlibdir" >> config.mak
 echo "incdir=\$(DESTDIR)$incdir" >> config.mak
 echo "bindir=\$(DESTDIR)$bindir" >> config.mak
 echo "mandir=\$(DESTDIR)$mandir" >> config.mak

diff --git a/vhook/Makefile b/vhook/Makefile
index dc311b83f3c80ec2363a4219a74a1ab9730a2042..7e9204c545cf94818c2d6769e04671e3725e961a 100644 (file)
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -27,12 +27,12 @@ depend: $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
 install: $(HOOKS)
-       install -d "$(libdir)/vhook"
-       install -m 755 $(HOOKS) "$(libdir)/vhook"
+       install -d "$(shlibdir)/vhook"
+       install -m 755 $(HOOKS) "$(shlibdir)/vhook"
 
 uninstall:
-       rm -f $(addprefix $(libdir)/vhook/,$(ALLHOOKS))
-       -rmdir "$(libdir)/vhook/"
+       rm -f $(addprefix $(shlibdir)/vhook/,$(ALLHOOKS))
+       -rmdir "$(shlibdir)/vhook/"
 
 %$(SLIBSUF): %.o
        $(CC) $(LDFLAGS) -g -o $@ $(VHOOKFLAGS) $<