vlc | branch: master | Rafaël Carré <[email protected]> | Sun Oct 17 13:50:44 2010 +0200| [99aa0dd994c218d7b64ef064dd8dbce74bfcbcf3] | committer: Rafaël Carré
win64 installer: install in \Programs Files \Program Files (x86) is for 32bits programs Fixes #4257 fix suggested by jb > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=99aa0dd994c218d7b64ef064dd8dbce74bfcbcf3 --- configure.ac | 14 ++++++++++++++ extras/package/win32/vlc.win32.nsi.in | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index b06964f..d227aa3 100644 --- a/configure.ac +++ b/configure.ac @@ -327,6 +327,20 @@ case "${host_os}" in AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) ac_default_prefix="`pwd`/_win32" DESTDIR="`pwd`/_win32/" + + dnl + dnl NSIS Installer prefix + dnl + case "${host}" in + amd64*|i686-w64*|x86_64*) + PROGRAMFILES="PROGRAMFILES64" + ;; + *) + PROGRAMFILES="PROGRAMFILES" + ;; + esac + AC_SUBST(PROGRAMFILES) + fi if test "${SYS}" = "mingwce"; then # add ws2 for closesocket, select, recv diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in index 2128624..bc393fb 100644 --- a/extras/package/win32/vlc.win32.nsi.in +++ b/extras/package/win32/vlc.win32.nsi.in @@ -31,7 +31,7 @@ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" OutFile ..\vlc-${VERSION}-win32.exe -InstallDir "$PROGRAMFILES\VideoLAN\VLC" +InstallDir "$...@programfiles@\VideoLAN\VLC" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" !ifdef NSIS_LZMA_COMPRESS_WHOLE SetCompressor lzma _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
