[geos-commits] r2712 - trunk

[svn_geos at osgeo.org]

Author: strk
Date: 2009-11-10 18:54:34 -0500 (Tue, 10 Nov 2009)
New Revision: 2712

Modified:
   trunk/HOWTO_RELEASE
   trunk/Makefile.am
Log:
Make ChangeLog target non-phony to keep 'distcheck' happy. Reorganize HOW_TO_RELEASE steps.


Modified: trunk/HOWTO_RELEASE
===================================================================
--- trunk/HOWTO_RELEASE	2009-11-10 22:58:36 UTC (rev 2711)
+++ trunk/HOWTO_RELEASE	2009-11-10 23:54:34 UTC (rev 2712)
@@ -15,14 +15,13 @@
      - VERSION_MAJOR for SUBSTANTIAL additions or C lib ABI break
        [ THIS MUST BE CAREFULLY AVOIDED ]
    
-3: Run make ChangeLog. Commit the new ChangeLog.
+3: Run make distcheck, fix any problem with it.
 
-4: Update the NEWS file (extract most important things from the ChangeLog)
+4: Run make ChangeLog.
 
-5: make distcheck
+5: Update the NEWS file (extract most important things from the ChangeLog)
 
-6: check everything is ok ;)
-   ./configure ; make ; make check
+6. Commit the new ChangeLog and NEWS files.
 
 7: Tag the release:
    $ base=http://svn.osgeo.org/geos/

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-11-10 22:58:36 UTC (rev 2711)
+++ trunk/Makefile.am	2009-11-10 23:54:34 UTC (rev 2712)
@@ -22,4 +22,7 @@
 ChangeLog:
 	cd $(srcdir) && svn2cl --authors=authors.svn -i -o ChangeLog
 
-.PHONY: ChangeLog
+# Should only be phony if in maintainer-mode or similar
+# to prevent 'distcheck' from failing due to read-only
+# source dir
+#.PHONY: ChangeLog