From d4eb157277eca3ee86a78dcaf38f70c44ea2599a Mon Sep 17 00:00:00 2001
From: diego <diego@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Date: Thu, 3 Aug 2006 22:50:54 +0000
Subject: [PATCH] Shared libraries now go in $(shlibdir), not $(libdir).

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5927 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
---
 common.mak | 6 +++---
 configure  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common.mak b/common.mak
index 2748e5ed4..0c08a5938 100644
--- a/common.mak
+++ b/common.mak
@@ -86,9 +86,9 @@ uninstall-libs:
 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)
 
diff --git a/configure b/configure
index d540ff42c..fbe7939e8 100755
--- a/configure
+++ b/configure
@@ -530,7 +530,7 @@ audio_oss="yes"
 dv1394="no"
 make="gmake"
 LIBOBJFLAGS="\$(PIC)"
-LDCONFIG="ldconfig -m \$(libdir)"
+LDCONFIG="ldconfig -m \$(shlibdir)"
 extralibs="$extralibs -lossaudio"
 ;;
 FreeBSD)
@@ -567,8 +567,8 @@ v4l="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=""
-- 
2.39.2