diff options
| -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="" |