Define IPV6_PROTECTION_LEVEL manually - closes #96

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f2e600e6a0a3721a3a95fc0bc991e85966956113..23d56c994a60b9ab7125993e406556edfc5f03b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -497,7 +497,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
          objc) cmd="$(OBJCLINK)" ;; \
          c|*) cmd="$(LINK)" ;; \
        esac ; \
-       cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDFLAGS) $(vlc_LDADD) $(LIBS)" ; \
+       cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS)" ; \
        echo $$cmd ; \
        eval $$cmd
 
@@ -527,18 +527,20 @@ vlc-bundle: vlc
        find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
 endif
 
-# Install the symlinks
+# Install the symlinks and shared libvlc
 install-exec-local:
        for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
          rm -f "$(DESTDIR)$(bindir)/$$i" && \
          ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
        fi ; done
+       test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
 
 # the opposite of install-{data,exec}-local
 uninstall-local:
        for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
          rm -f "$(DESTDIR)$(bindir)/$$i" ; \
        fi ; done
+       test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
 
 if HAVE_DARWIN
 # Create the MacOS X app