X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=19eae1a6369e98b486280f471c91f35c8513c9d6;hb=4bf5e817d35569492c6c3ca068f277d0ae49702f;hp=04c1514579ae47535996671f5f6ec8351270c98e;hpb=dbf2c5168319b48bb8199a7d818893086f688284;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 04c1514579..19eae1a636 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,6 +56,7 @@ SUFFIXES =
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-fast-install \
+	--disable-dbus \
 	--disable-dvd --disable-mad --disable-libmpeg2 \
 	--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
 	--disable-fribidi --disable-glx
@@ -268,7 +269,8 @@ EXTRA_DIST += \
 	extras/package/macosx/eyetvplugin/eyetvplugin.h \
 	extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \
 	extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \
-	extras/package/macosx/README.MacOSX.rtf
+	extras/package/macosx/README.MacOSX.rtf \
+	extras/package/macosx/Info.plist
 
 
 ###############################################################################
@@ -401,7 +403,7 @@ VLC-release.app: vlc
 	rm -Rf "$(top_builddir)/tmp"
 	mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
 	rm -Rf $(top_builddir)/VLC-release.app
-	for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+	for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \
 	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
 	done
 	for i in AUTHORS COPYING THANKS; do \
@@ -842,18 +844,18 @@ if BUILD_OSDMENU
 	done
 endif
 
-package-win-common-strip:
-	$(STRIP) "$(top_builddir)/vlc-$(VERSION)/vlc$(EXEEXT)"
+package-win-common-strip: package-win32-base-debug
+	$(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
 	$(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
 	$(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
 if BUILD_MOZILLA
-	$(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT);
+	$(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
 endif
 if BUILD_ACTIVEX
-	$(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
+	$(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)"
 endif
 
-package-win32-base: package-win32-base-debug package-win-common-strip
+package-win32-base: package-win-common-strip
 	for i in "" $(top_builddir)/vlc-$(VERSION)/plugins/*$(LIBEXT) ; \
 	  do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done