[gnumeric] win32: install gnumeric.nsi too.



commit 2b5788f360a97325652f502ebecb0ed8095f49f6
Author: Morten Welinder <terra gnome org>
Date:   Tue Apr 13 21:04:49 2010 -0400

    win32: install gnumeric.nsi too.

 tools/win32/Makefile.am     |    9 +++++++++
 tools/win32/build           |    2 +-
 tools/win32/gnumeric.nsi.in |    4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/tools/win32/Makefile.am b/tools/win32/Makefile.am
index c6e7c05..d4fe9a8 100755
--- a/tools/win32/Makefile.am
+++ b/tools/win32/Makefile.am
@@ -14,4 +14,13 @@ clean:
 EXTRA_DIST = gnumeric.nsi.in gtkrc moduleset.in \
 	build jhbuildrc.py
 
+
+if WITH_WIN32
+install-data-hook:
+	install gnumeric.nsi ${prefix}
+
+uninstall-local:
+	rm $(prefix)/gnumeric.nsi
+endif
+
 .PHONY : debug release all clean
diff --git a/tools/win32/build b/tools/win32/build
index b14a3bd..c763336 100755
--- a/tools/win32/build
+++ b/tools/win32/build
@@ -66,7 +66,7 @@ setup_html_help() {
     build_mkdir "etc/gtk-2.0"
     install "${srcdir}/gtkrc" "etc/gtk-2.0"
 
-    (cd "${JH_PREFIX}/deploy" && ln -f -s $srcdir/../../COPYING .)
+    (cd "${JH_PREFIX}/deploy" && cp $srcdir/../../COPYING .)
 
     build_mkdir "${archive_dir}"
 
diff --git a/tools/win32/gnumeric.nsi.in b/tools/win32/gnumeric.nsi.in
index e62f145..7bc0e43 100644
--- a/tools/win32/gnumeric.nsi.in
+++ b/tools/win32/gnumeric.nsi.in
@@ -17,8 +17,8 @@ SetCompressor /SOLID lzma
 
 !define GOFFICE_VERSION		"@GOFFICE_VERSION@"
 
-!define GTK_VERSION		"2.18"
-!define GTK_VENDORRC		"2"
+!define GTK_VERSION		"2.20"
+!define GTK_VENDORRC		"0"
 !define GTK_VENDORVERSION	"${GTK_VERSION}.${GTK_VENDORRC}"
 
 ; MUI 1.67 compatible ------



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]