[Ffmpeg-cvslog] r5755 - in trunk: common.mak configure vhook/Makefile

[diego]

Author: diego
Date: Sun Jul 16 01:01:52 2006
New Revision: 5755

Modified:
   trunk/common.mak
   trunk/configure
   trunk/vhook/Makefile

Log:
Create infrastructure to install shared and static libs into different places.
based on patch by V?ctor Paesa wzrlpy at arsystel com


Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Sun Jul 16 01:01:52 2006
@@ -65,11 +65,11 @@
 	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)

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun Jul 16 01:01:52 2006
@@ -26,6 +26,7 @@
   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 @@
 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 @@
   ;;
   --libdir=*) libdir="$optval"; force_libdir=yes
   ;;
+  --shlibdir=*) shlibdir="$optval"
+  ;;
   --incdir=*) incdir="$optval"
   ;;
   --mandir=*) mandir="$optval"
@@ -1558,6 +1562,7 @@
 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

Modified: trunk/vhook/Makefile
==============================================================================
--- trunk/vhook/Makefile	(original)
+++ trunk/vhook/Makefile	Sun Jul 16 01:01:52 2006
@@ -27,12 +27,12 @@
 	$(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) $<