[vlc-devel] commit: More config.status magic. (Christophe Mutricy )

[git version control]

vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Sat Jun 14 00:24:31 2008 +0100| [15a5a372d8163340162f03bd0ed7a2d33a5ba33c]

More config.status magic.

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=15a5a372d8163340162f03bd0ed7a2d33a5ba33c
---

 Makefile.am                           |   10 +++++-----
 extras/package/win32/vlc.win32.nsi.in |    3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5b073d0..66dbb51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -860,13 +860,13 @@ package-win32-base: package-win32-base-debug package-win-common-strip
 package-win32-base-exe: package-win32-base
 # Create package
 	if makensis -VERSION >/dev/null 2>&1; then \
-	    MAKENSIS="makensis -DVERSION=$(VERSION)"; \
+	    MAKENSIS="makensis"; \
 	elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
-	    MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=$(VERSION)"; \
+	    MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis)"; \
 	elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \
-	    MAKENSIS="$(PROGRAMFILES)/NSIS/makensis -DVERSION=$(VERSION)"; \
+	    MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \
 	elif wine --version >/dev/null 2>&1; then \
-	    MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=$(VERSION)"; \
+	    MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
 	else \
 	    echo 'Error: cannot locate makensis tool'; exit 1; \
 	fi; \
@@ -877,7 +877,7 @@ package-win32-base-exe-cygwin: package-win32-base-exe
 
 package-win32-base-exe-linux:
 # Create package
-	makensis -DVERSION=$(VERSION) $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi
+	makensis $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi
 
 package-win32-base-zip: package-win32-base
 # Create package 
diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index e06d3cf..948e3b0 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -4,7 +4,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 !define PRODUCT_NAME "VLC media player"
-!define PRODUCT_VERSION '0.9.0-git'
+!define VERSION @VERSION@
+!define PRODUCT_VERSION @VERSION@ 
 !define PRODUCT_GROUP "VideoLAN"
 !define PRODUCT_PUBLISHER "VideoLAN Team"
 !define PRODUCT_WEB_SITE "http://www.videolan.org"