summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile5
-rw-r--r--src/configure.ac4
-rw-r--r--src/gf.wxs.in4
3 files changed, 8 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile
index b4dac0668..c167f2fd4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -204,7 +204,10 @@ grammar-dist:
$(TAR) -zcf $(GRAMMAR_DIST_DIR).tgz $(GRAMMAR_DIST_DIR)
rm -rf $(GRAMMAR_DIST_DIR)
-windows-msi:
+gf.wxs: config.status gf.wxs.in
+ ./config.status --file=$@
+
+windows-msi: gf.wxs
candle -nologo gf.wxs
light -nologo -o $(MSI_FILE) gf.wixobj
diff --git a/src/configure.ac b/src/configure.ac
index ddfa6165e..90a5d7e01 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4,9 +4,9 @@ AC_INIT([GF],[2.2],[aarne@cs.chalmers.se],[GF])
AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.22 $)
+AC_REVISION($Revision: 1.23 $)
-AC_CONFIG_FILES([config.mk jgf gf.wxs])
+AC_CONFIG_FILES([config.mk jgf])
AC_CANONICAL_HOST
diff --git a/src/gf.wxs.in b/src/gf.wxs.in
index ffa680abf..e2b21f12b 100644
--- a/src/gf.wxs.in
+++ b/src/gf.wxs.in
@@ -36,8 +36,8 @@
WorkingDirectory="INSTALLDIR" />
</Component>
- <Directory Id="GFDocDir" Name="doc" DiskId="1">
- <Component Id="GFDoc" Guid="23BEEBBF-F9AB-459F-B8D2-8414BB47834A">
+ <Directory Id="GFDocDir" Name="doc">
+ <Component Id="GFDoc" Guid="23BEEBBF-F9AB-459F-B8D2-8414BB47834A" DiskId="1">
<File Id="GFReadme" Name="README.txt" src="../README" />
<File Id="GFLicenee" Name="LICENSE.txt" src="../LICENSE" />
</Component>