Look for tar in configure, since we must have gtar on Solaris and tar on Windows.

4 files changed, 39 insertions, 23 deletions

diff --git a/src/ReleaseProcedure b/src/ReleaseProcedure
index 24a350ec8..30749b926 100644
--- a/src/ReleaseProcedure
+++ b/src/ReleaseProcedure
@@ -70,7 +70,7 @@ buildarchtranslate: i686: i586
    $ cd src 
    $ ./configure && make rpm
 
-12. Build a generic binary x86/linux (should be done on a Linux box,
+12. Build a generic binary x86/linux package (should be done on a Linux box,
     e.g. banded.medic.chalmers.se):
 
    $ cd src
@@ -95,12 +95,21 @@ buildarchtranslate: i686: i586
     TODO: Use OS X PackageMaker to build  a .pkg-file which can
     be installed using the standard OS X Installer program. 
 
-15. Build a Windows package:
+15. Build a binary Cygwin package (should be done on a Windows
+    machine with Cygwin):
+
+    $ cd src
+    $ ./configure && make binary-dist
+
+16. Build a Windows MSI package (FIXME: This doesn't work right,
+    pathnames with backslashes and spaces are not handled 
+    correctly in Windows. We only release abinary tarball
+    for Cygwin right now.):
 
     $ cd src
     $ ./configure && make all windows-msi
 
-16. Add new GF package release to SourceForge:
+17. Add new GF package release to SourceForge:
 
     - Project page -> Admin -> File releases -> Add release (for the
       GF package)
@@ -121,7 +130,7 @@ buildarchtranslate: i686: i586
       * sparc binary tarball -> Sparc/.gz
       * source package -> Any/Source .gz
 
-17. Add new GF-editor release. Repeat the steps above, but
+18. Add new GF-editor release. Repeat the steps above, but
     with GF-editor:
 
      - Add files and set properties:
@@ -130,7 +139,7 @@ buildarchtranslate: i686: i586
         figured out how to make noarch rpms from the same spec as 
 	arch-specific ones)
 
-18. (Only if releasing a new grammars distribution)
+19. (Only if releasing a new grammars distribution)
     Add new GF-grammars release. Repeat the steps above, but with
     GF-grammars:
 
@@ -138,6 +147,6 @@ buildarchtranslate: i686: i586
 
       * grammar tarball -> Platform independent/Source .gz
 
-19. Update website.
+20. Update website.
 
-20. Party!
+21. Party!
diff --git a/src/config.mk.in b/src/config.mk.in
index dc04386ca..9760d969a 100644
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -18,6 +18,7 @@ LDFLAGS = @LDFLAGS@
 EXEEXT = @EXEEXT@
 
 INSTALL = @INSTALL@
+TAR = @TAR@
 
 GHC = "@GHC@"
 GHCI = "@GHCI@"
diff --git a/src/configure.ac b/src/configure.ac
index 3bfd9c978..ddfa6165e 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([GF],[2.2],[aarne@cs.chalmers.se],[GF])
 
 AC_PREREQ(2.53)
 
-AC_REVISION($Revision: 1.21 $)
+AC_REVISION($Revision: 1.22 $)
 
 AC_CONFIG_FILES([config.mk jgf gf.wxs])
 
@@ -133,6 +133,12 @@ AC_SUBST(ENABLE_JAVA)
 
 
 dnl ***********************************************
+dnl TAR
+dnl ***********************************************
+
+AC_CHECK_PROGS(TAR, gtar tar)
+
+dnl ***********************************************
 dnl Other programs
 dnl ***********************************************
 
diff --git a/src/gf.wxs.in b/src/gf.wxs.in
index 56d6bd66f..ffa680abf 100644
--- a/src/gf.wxs.in
+++ b/src/gf.wxs.in
@@ -16,30 +16,30 @@
       <Directory Id="ProgramFilesFolder">
         <Directory Id="INSTALLDIR" Name="GF-@PACKAGE_VERSION@">
 
-          <Component Id="GFBinary" Guid="E2A44A6C-0252-4346-85AE-BC6A16BFB0FC">
-            <File Id="GFEXE" Name="gf.exe" DiskId="1" src="../bin/gf.exe" />
+          <Component Id="GFBinary" Guid="E2A44A6C-0252-4346-85AE-BC6A16BFB0FC" DiskId="1">
+            <File Id="GFEXE" Name="gf.exe" src="../bin/gf.exe" />
             <Shortcut Id="GFStartMenu" Directory="GFProgramMenuDir" 
-                Name="GF" Target="[!GFEXE]" />
+                      Name="GF" Target="[!GFEXE]" />
           </Component>
 
-          <Component Id="GFDocBinary" Guid="BDCA6F34-EE0A-4E72-8D00-CB7CAF3CEAEA">
-            <File Id="GFDocEXE" Name="gfdoc.exe" DiskId="1" src="tools/gfdoc.exe" />
+          <Component Id="GFDocBinary" Guid="BDCA6F34-EE0A-4E72-8D00-CB7CAF3CEAEA" DiskId="1">
+            <File Id="GFDocEXE" Name="gfdoc.exe" src="tools/gfdoc.exe" />
           </Component>
 
-          <Component Id="GFEditor" Guid="39F885F7-BC49-4CBC-9DCD-569C95AA3364">
-            <Environment Id="GFHomeEnv" Name="GF_HOME" Action="create" Part="all" Permanent="no" 
-                         Value="[INSTALLDIR]" />
-            <File Id="GFEditorBat" Name="jgf.bat" DiskId="1" src="jgf.bat" />
-            <File Id="GFEditorJar" Name="gf-java.jar" DiskId="1" src="JavaGUI/gf-java.jar" />
+          <Component Id="GFEditor" Guid="39F885F7-BC49-4CBC-9DCD-569C95AA3364" DiskId="1">
+            <Environment Id="GFHomeEnv" Name="GF_HOME" Action="create" Part="all" 
+                         Permanent="no" Value="[INSTALLDIR]" />
+            <File Id="GFEditorBat" Name="jgf.bat" src="jgf.bat" />
+            <File Id="GFEditorJar" Name="gf-java.jar" src="JavaGUI/gf-java.jar" />
             <Shortcut Id="GFEditorStartMenu" Directory="GFProgramMenuDir" 
-                Name="GFEditor" LongName="GF Editor" Target="[!GFEditorBat]" 
-                WorkingDirectory="INSTALLDIR" />
+                      Name="GFEditor" LongName="GF Editor" Target="[!GFEditorBat]" 
+                      WorkingDirectory="INSTALLDIR" />
           </Component>
 
-          <Directory Id="GFDocDir" Name="doc">
+          <Directory Id="GFDocDir" Name="doc" DiskId="1">
             <Component Id="GFDoc" Guid="23BEEBBF-F9AB-459F-B8D2-8414BB47834A">
-              <File Id="GFReadme" Name="README.txt" DiskId="1" src="../README" />
-              <File Id="GFLicenee" Name="LICENSE.txt" DiskId="1" src="../LICENSE" />
+              <File Id="GFReadme" Name="README.txt" src="../README" />
+              <File Id="GFLicenee" Name="LICENSE.txt" src="../LICENSE" />
             </Component>
           </Directory>