Shared libraries now go in $(shlibdir), not $(libdir).
authorDiego Biurrun <diego@biurrun.de>
Thu, 3 Aug 2006 22:50:54 +0000 (22:50 +0000)
committerDiego Biurrun <diego@biurrun.de>
Thu, 3 Aug 2006 22:50:54 +0000 (22:50 +0000)
Originally committed as revision 5927 to svn://svn.ffmpeg.org/ffmpeg/trunk

common.mak
configure

index 2748e5e..0c08a59 100644 (file)
@@ -86,9 +86,9 @@ uninstall-libs:
 ifeq ($(CONFIG_MINGW),yes)
        -rm -f $(prefix)/$(SLIBNAME)
 else
 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)
 
 endif
        -rm -f $(libdir)/$(LIB)
 
index d540ff4..fbe7939 100755 (executable)
--- a/configure
+++ b/configure
@@ -530,7 +530,7 @@ audio_oss="yes"
 dv1394="no"
 make="gmake"
 LIBOBJFLAGS="\$(PIC)"
 dv1394="no"
 make="gmake"
 LIBOBJFLAGS="\$(PIC)"
-LDCONFIG="ldconfig -m \$(libdir)"
+LDCONFIG="ldconfig -m \$(shlibdir)"
 extralibs="$extralibs -lossaudio"
 ;;
 FreeBSD)
 extralibs="$extralibs -lossaudio"
 ;;
 FreeBSD)
@@ -567,8 +567,8 @@ v4l="no"
 v4l2="no"
 audio_oss="no"
 dv1394="no"
 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=""
 extralibs=""
 strip="strip -x"
 installstrip=""