From f3d741a20994a7b454dde6aa5f8688932b06106b Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Fri, 18 Dec 2009 10:57:25 +0100 Subject: [PATCH] automake: Use CONTRIB_DIR instead of manually assuming contrib location. --- Makefile.am | 10 +++++----- configure.ac | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index b5cfbfc8d0..e28142fa9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -357,9 +357,9 @@ vlc-bundle: vlc cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \ fi ; \ done - if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \ + if test -d $(CONTRIB_DIR)/vlc-lib ; then \ mkdir -p $(top_builddir)/vlc-bundle/lib ; \ - for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \ + for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \ cp $$i $(top_builddir)/vlc-bundle/lib/ ; \ done ; \ fi @@ -440,7 +440,7 @@ VLC-release.app: vlc cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle - cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle + cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -593,7 +593,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle - cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle + cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -765,7 +765,7 @@ package-win32-base-debug: package-win-common fi ; done # Contrib *.dll's -# cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true +# cp $(CONTRIB_DIR)/lib/*.dll "vlc-$(VERSION)/" || true #Enable DEP and ASLR for all the binaries if USE_PEFLAGS diff --git a/configure.ac b/configure.ac index bdc2275136..f42ae168f7 100644 --- a/configure.ac +++ b/configure.ac @@ -135,6 +135,7 @@ AC_ARG_WITH(contrib, AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}]) AS_IF([test -d ${CONTRIB_DIR}/lib],[ AC_MSG_RESULT([yes]) + AC_SUBST(CONTRIB_DIR) export PATH=${CONTRIB_DIR}/bin:$PATH CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include" CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include" -- 2.39.2