Changeset 15a5a372d8163340162f03bd0ed7a2d33a5ba33c

Show
Ignore:
Timestamp:
14/06/08 01:24:31 (4 months ago)
Author:
Christophe Mutricy <xtophe@videolan.org>
git-committer:
Christophe Mutricy <xtophe@videolan.org> 1213399471 +0100
git-parent:

[7290a1dc36d415fd9c800abad0c34a396b562236]

git-author:
Christophe Mutricy <xtophe@videolan.org> 1213399471 +0100
Message:

More config.status magic.

I'm not sure why we have a PRODUCT_VERSION and VERSION

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    r097f8fc r15a5a37  
    861861# Create package 
    862862    if makensis -VERSION >/dev/null 2>&1; then \ 
    863         MAKENSIS="makensis -DVERSION=$(VERSION)"; \ 
     863        MAKENSIS="makensis"; \ 
    864864    elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ 
    865         MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=$(VERSION)"; \ 
     865        MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis)"; \ 
    866866    elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \ 
    867         MAKENSIS="$(PROGRAMFILES)/NSIS/makensis -DVERSION=$(VERSION)"; \ 
     867        MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \ 
    868868    elif wine --version >/dev/null 2>&1; then \ 
    869         MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=$(VERSION)"; \ 
     869        MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \ 
    870870    else \ 
    871871        echo 'Error: cannot locate makensis tool'; exit 1; \ 
    …… 
    878878package-win32-base-exe-linux: 
    879879# Create package 
    880     makensis -DVERSION=$(VERSION) $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi 
     880    makensis $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi 
    881881 
    882882package-win32-base-zip: package-win32-base 

  • extras/package/win32/vlc.win32.nsi.in

    r722f244 r15a5a37  
    55 
    66!define PRODUCT_NAME "VLC media player" 
    7 !define PRODUCT_VERSION '0.9.0-git' 
     7!define VERSION @VERSION@ 
     8!define PRODUCT_VERSION @VERSION@  
    89!define PRODUCT_GROUP "VideoLAN" 
    910!define PRODUCT_PUBLISHER "VideoLAN Team"