diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-08-03 22:50:54 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-08-03 22:50:54 +0000 |
| commit | a1309f8f6109510efa0faad9603246645891a6e9 (patch) | |
| tree | 4f4cd68efecd6e8002326d361ff72d951c8df1e3 | |
| parent | 5237ce67ebbe19b003148d5f38b107644f31bc48 (diff) | |
| download | ffmpeg-a1309f8f6109510efa0faad9603246645891a6e9.tar.gz | |
Shared libraries now go in $(shlibdir), not $(libdir).
Originally committed as revision 5927 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | common.mak | 6 | ||||
| -rwxr-xr-x | configure | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/common.mak b/common.mak index 2748e5ed46..0c08a59388 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) @@ -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="" |