ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Originally committed as revision 5927 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-08-03 22:50:54 +00:00
parent 5237ce67eb
commit a1309f8f61
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.mak
View File

@ -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)

6
configure vendored
View File

@ -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=""