rpms/postgis/FC-6 postgis-gnumakefile.patch, NONE, 1.1 postgis-jdbcmakefile.patch, NONE, 1.1

[Devrim GÜNDÜZ (devrim)]

Author: devrim

Update of /cvs/extras/rpms/postgis/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12810

Added Files:
	postgis-gnumakefile.patch postgis-jdbcmakefile.patch 
Log Message:
Add new patches...


postgis-gnumakefile.patch:

--- NEW FILE postgis-gnumakefile.patch ---
--- GNUmakefile.old	2007-07-02 17:13:05.000000000 +0300
+++ GNUmakefile	2007-07-02 17:13:59.000000000 +0300
@@ -4,13 +4,13 @@
 #
 #-----------------------------------------------------
 
-all: Makefile.config liblwgeom loaderdumper utils templategis
+all: Makefile.config liblwgeom loaderdumper utils
 
-install: all liblwgeom-install loaderdumper-install templategis-install
+install: all liblwgeom-install loaderdumper-install
 
-uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall templategis-uninstall
+uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall
 
-clean: Makefile.config liblwgeom-clean loaderdumper-clean docs-clean test-clean templategis-clean
+clean: Makefile.config liblwgeom-clean loaderdumper-clean docs-clean test-clean
 	rm -f lwpostgis.sql lwpostgis_upgrade.sql
 
 distclean: clean
@@ -59,18 +59,6 @@
 loaderdumper-uninstall:
 	$(MAKE) -C loader uninstall
 
-templategis: Makefile.config
-	$(MAKE) -C extras/template_gis
-
-templategis-clean:
-	$(MAKE) -C extras/template_gis clean
-
-templategis-install:
-	$(MAKE) -C extras/template_gis install
-
-templategis-uninstall:
-	$(MAKE) -C extras/template_gis uninstall
-
 docs: Makefile.config
 	$(MAKE) -C doc 
 

postgis-jdbcmakefile.patch:

--- NEW FILE postgis-jdbcmakefile.patch ---
--- java/jdbc/Makefile.old	2007-01-08 12:12:01.000000000 +0200
+++ java/jdbc/Makefile	2007-06-26 21:41:57.000000000 +0300
@@ -27,7 +27,7 @@
 
 # Configure the helper executables used during build.
 
-JAVAC?=javac -target 1.2 -source 1.2
+JAVAC?=javac -target 1.5 -source 1.5
 JAVA?=java
 JAR?=jar
 MKDIR?=mkdir -p
@@ -249,9 +249,11 @@
 postgis-jdbc-javadoc.zip: javadoc-build
 	$(JAR) -cf postgis-jdbc-javadoc.zip -C javadoc-build .
 
-javadoc-build: jtscompile compile
+javadoc-build:
 	$(MKDIR) javadoc-build
-	javadoc -d javadoc-build -sourcepath src:jtssrc \
+	# We use an ugly trick to build on windows and unix - 
+	# javadoc command line options are not portable wr/t path separators
+	javadoc -d javadoc-build -sourcepath "src:jtssrc:;src;jtssrc" \
 		org.postgis org.postgis.jts org.postgis.binary org.postgis.java2d examples
 
 # Preliminary JTS support