Commit d4eb1572 authored by diego's avatar diego

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5927 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 20c95296
......@@ -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=""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment