[Ffmpeg-cvslog] r5927 - in trunk: common.mak configure

[diego]

Author: diego
Date: Fri Aug  4 00:50:54 2006
New Revision: 5927

Modified:
   trunk/common.mak
   trunk/configure

Log:
Shared libraries now go in $(shlibdir), not $(libdir).


Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Fri Aug  4 00:50:54 2006
@@ -86,9 +86,9 @@
 ifeq ($(CONFIG_MINGW),yes)
 	-rm -f $(prefix)/$(SLIBNAME)
 else
-	-rm -f $(libdir)/$(SLIBNAME_WITH_MAJOR) \
-	       $(libdir)/$(SLIBNAME)            \
-	       $(libdir)/$(SLIBNAME_WITH_VERSION)
+	-rm -f $(shlibdir)/$(SLIBNAME_WITH_MAJOR) \
+	       $(shlibdir)/$(SLIBNAME)            \
+	       $(shlibdir)/$(SLIBNAME_WITH_VERSION)
 endif
 	-rm -f $(libdir)/$(LIB)
 

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri Aug  4 00:50:54 2006
@@ -530,7 +530,7 @@
 dv1394="no"
 make="gmake"
 LIBOBJFLAGS="\$(PIC)"
-LDCONFIG="ldconfig -m \$(libdir)"
+LDCONFIG="ldconfig -m \$(shlibdir)"
 extralibs="$extralibs -lossaudio"
 ;;
 FreeBSD)
@@ -567,8 +567,8 @@
 v4l2="no"
 audio_oss="no"
 dv1394="no"
-SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(libdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION)"
-VHOOKFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(libdir)/vhook/$@'
+SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION)"
+VHOOKFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@'
 extralibs=""
 strip="strip -x"
 installstrip=""