[GRASS-SVN] r30579 - grass/branches/releasebranch_6_3

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Mar 16 07:22:25 EDT 2008


Author: martinl
Date: 2008-03-16 07:22:25 -0400 (Sun, 16 Mar 2008)
New Revision: 30579

Modified:
   grass/branches/releasebranch_6_3/Makefile
Log:
Makefile: changes backported from trunk; install files -- AUTHORS COPYING GPL.TXT required by wxGUI (About dialog); use svn2cl for creating Changelog

Modified: grass/branches/releasebranch_6_3/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/Makefile	2008-03-16 11:20:21 UTC (rev 30578)
+++ grass/branches/releasebranch_6_3/Makefile	2008-03-16 11:22:25 UTC (rev 30579)
@@ -63,7 +63,7 @@
 	LOCALE=0
 endif
 
-FILES = AUTHORS COPYING README REQUIREMENTS.html GPL.TXT
+FILES = AUTHORS COPYING CHANGES REQUIREMENTS.html GPL.TXT
 
 BIN_DIST_FILES = $(FILES) \
 	grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.tmp \
@@ -256,6 +256,7 @@
 	-sed -e "s#WINGISBASE=.*#WINGISBASE=${INST_DIR}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.bat > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.bat
 	-chmod a+x ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.bat
 endif
+	-cd ${GISBASE} ; tar cBf - $(FILES) | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - bwidget | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - docs | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
@@ -277,7 +278,7 @@
 	-sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/fontcap > ${INST_DIR}/etc/fontcap
 	@##### -chmod -R 1777 ${INST_DIR}/locks 2>/dev/null
 	-chmod -R a+rX ${INST_DIR} 2>/dev/null
-	#GEM installation
+	@#GEM installation
 	-tar cBf - gem/skeleton | (cd ${INST_DIR}/etc ; tar xBf - ) 2>/dev/null
 	-${INSTALL} gem/gem6 ${BINDIR} 2>/dev/null
 	@# enable OSX Help Viewer
@@ -421,9 +422,12 @@
 
 changelog:
 	@ echo "creating ChangeLog file (following 'trunk' only)..."
-	@ # cvs2cl.pl creates a GNU style ChangeLog file:
-	@ # http://www.red-bean.com/cvs2cl
-	GRASS_PERL=${PERL} sh tools/cvs2cl.pl -F trunk -f ./ChangeLog
+	@ # svn2cl creates a GNU style ChangeLog file:
+	@ # http://ch.tudelft.nl/~arthur/svn2cl/
+	@if [ ! -x "`which svn2cl`" ] ; then \
+		echo "\"svn2cl\" is required, please install first from http://ch.tudelft.nl/~arthur/svn2cl/" ;	exit 1 ; \
+	fi
+	sh svn2cl ./ChangeLog
 
 
 builddemolocation:



More information about the grass-commit mailing list