vlc | branch: master | Rafaël Carré <[email protected]> | Wed Nov 23 18:10:54 2011 -0500| [6f7cf7daf8150009b082f8f67116ff041fb80b93] | committer: Rafaël Carré
Revert "Don't assume some default prefix is used" This reverts commit ebf341dc34b3c237cab00000ef8c833a7f535878. We can't force a prefix at make install with DESTDIR files are installed in $(DESTDIR)/$(prefix) not $(DESTDIR) This also breaks OSX binaries, and thus test suite (is that libtool's fault?) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6f7cf7daf8150009b082f8f67116ff041fb80b93 --- configure.ac | 4 ++++ extras/package/macosx/configure.sh | 1 + extras/package/macosx/package.mak | 4 ++-- extras/package/win32/package.mak | 26 +++++++++++++------------- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 8bffe97..dd25e2b 100644 --- a/configure.ac +++ b/configure.ac @@ -221,6 +221,8 @@ case "${host_os}" in VLC_ADD_LIBS([win32text],[-lgdi32]) VLC_ADD_LIBS([cdda vcdx sdl_image vout_sdl],[-lwinmm]) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) + ac_default_prefix="`pwd`/_win32" + DESTDIR="`pwd`/_win32/" dnl dnl NSIS Installer prefix and WIN64 @@ -240,6 +242,8 @@ case "${host_os}" in if test "${SYS}" = "mingwce"; then VLC_ADD_LIBS([libvlccore],[-lmmtimer]) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) + ac_default_prefix="`pwd`/_wince" + DESTDIR="`pwd`/_wince/" fi ;; *nto*) diff --git a/extras/package/macosx/configure.sh b/extras/package/macosx/configure.sh index 5fb4683..9ccbaf0 100755 --- a/extras/package/macosx/configure.sh +++ b/extras/package/macosx/configure.sh @@ -1,6 +1,7 @@ #!/bin/sh OPTIONS=" + --prefix=`pwd`/vlc_install_dir --enable-faad --enable-flac --enable-theora diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak index 5f02842..d0ac46c 100644 --- a/extras/package/macosx/package.mak +++ b/extras/package/macosx/package.mak @@ -25,8 +25,8 @@ VLC-release.app: VLC-tmp.app VLC-tmp.app: vlc - $(AM_V_GEN)(cd src && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="`pwd`"/vlc_install_dir install $(silentstd)) - (cd lib && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="`pwd`"/vlc_install_dir install $(silentstd)) + $(AM_V_GEN)(cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)) + (cd lib && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)) rm -Rf "$(top_builddir)/tmp" "$@" mkdir -p "$(top_builddir)/tmp/extras/package/macosx" cd $(srcdir)/extras/package/macosx; cp -R vlc.xcodeproj Resources README.MacOSX.rtf $(abs_top_builddir)/tmp/extras/package/macosx/ diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak index 8430406..3ba703c 100644 --- a/extras/package/win32/package.mak +++ b/extras/package/win32/package.mak @@ -20,7 +20,7 @@ endif endif package-win-install: - $(MAKE) DESTDIR="`pwd`"/vlc_install_dir install + $(MAKE) install touch $@ @@ -28,7 +28,7 @@ package-win-common: package-win-install build-npapi mkdir -p "$(win32_destdir)"/ # Executables, major libs+manifests - find vlc_install_dir -maxdepth 4 \( -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" \) -exec cp {} "$(win32_destdir)/" \; + find $(prefix) -maxdepth 4 \( -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" \) -exec cp {} "$(win32_destdir)/" \; cd $(top_srcdir)/extras/package/win32 && cp vlc$(EXEEXT).manifest libvlc$(LIBEXT).manifest "$(win32_destdir)/" # Text files, clean them from mail addresses @@ -40,21 +40,21 @@ package-win-common: package-win-install build-npapi done cp $(srcdir)/share/icons/vlc.ico $(win32_destdir) - cp -r vlc_install_dir/lib/vlc/plugins $(win32_destdir) - -cp -r vlc_install_dir/share/locale $(win32_destdir) + cp -r $(prefix)/lib/vlc/plugins $(win32_destdir) + -cp -r $(prefix)/share/locale $(win32_destdir) if BUILD_LUA mkdir -p $(win32_destdir)/lua/ - cp -r vlc_install_dir/lib/vlc/lua/* vlc_install_dir/share/vlc/lua/* $(win32_destdir)/lua/ + cp -r $(prefix)/lib/vlc/lua/* $(prefix)/share/vlc/lua/* $(win32_destdir)/lua/ endif if BUILD_SKINS rm -fr $(win32_destdir)/skins - cp -r vlc_install_dir/share/vlc/skins2 $(win32_destdir)/skins + cp -r $(prefix)/share/vlc/skins2 $(win32_destdir)/skins endif if BUILD_OSDMENU - cp -r vlc_install_dir/share/vlc/osdmenu "$(win32_destdir)/" + cp -r $(prefix)/share/vlc/osdmenu "$(win32_destdir)/" for file in $(win32_destdir)/osdmenu/*.cfg; do \ sed -i.orig -e 's%share/osdmenu%osdmenu%g' -e 's%/%\\%g' "$$file"; \ rm -f -- "$${file}.orig"; \ @@ -77,12 +77,12 @@ endif # SDK mkdir -p "$(win32_destdir)/sdk/lib/" - cp -r vlc_install_dir/include "$(win32_destdir)/sdk" - cp -r vlc_install_dir/lib/pkgconfig "$(win32_destdir)/sdk/lib" - cd vlc_install_dir/lib && cp -rv libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la "$(win32_destdir)/sdk/lib/" + cp -r $(prefix)/include "$(win32_destdir)/sdk" + cp -r $(prefix)/lib/pkgconfig "$(win32_destdir)/sdk/lib" + cd $(prefix)/lib && cp -rv libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la "$(win32_destdir)/sdk/lib/" if !HAVE_WINCE - $(DLLTOOL) -D libvlc.dll -l "$(win32_destdir)/sdk/lib/libvlc.lib" -d "$(top_builddir)/lib/.libs/libvlc.dll.def" "vlc_install_dir/bin/libvlc.dll" - $(DLLTOOL) -D libvlccore.dll -l "$(win32_destdir)/sdk/lib/libvlccore.lib" -d "$(top_builddir)/src/.libs/libvlccore.dll.def" "vlc_install_dir/bin/libvlccore.dll" + $(DLLTOOL) -D libvlc.dll -l "$(win32_destdir)/sdk/lib/libvlc.lib" -d "$(top_builddir)/lib/.libs/libvlc.dll.def" "$(prefix)/bin/libvlc.dll" + $(DLLTOOL) -D libvlccore.dll -l "$(win32_destdir)/sdk/lib/libvlccore.lib" -d "$(top_builddir)/src/.libs/libvlccore.dll.def" "$(prefix)/bin/libvlccore.dll" if !HAVE_WIN64 mkdir -p "$(win32_destdir)/sdk/activex/" @@ -114,7 +114,7 @@ package-win-strip: package-win-common package-win32-webplugin-common: package-win-strip mkdir -p "$(win32_xpi_destdir)/" cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/" - find vlc_install_dir -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \; + find $(prefix) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \; cp $(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins/" cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins/" rm -rf "$(win32_xpi_destdir)/plugins/*qt*" _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
