diff --new-file -u -r gdal-1.4.0.orig/LICENSE gdal-1.4.0/LICENSE
--- gdal-1.4.0.orig/LICENSE	1969-12-31 19:00:00.000000000 -0500
+++ gdal-1.4.0/LICENSE	2007-01-12 10:55:42.000000000 -0500
@@ -0,0 +1,19 @@
+Copyright (c) 2000, Frank Warmerdam
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --new-file -u -r gdal-1.4.0.orig/apps/GNUmakefile gdal-1.4.0/apps/GNUmakefile
--- gdal-1.4.0.orig/apps/GNUmakefile	2006-11-03 22:02:15.000000000 -0500
+++ gdal-1.4.0/apps/GNUmakefile	2007-01-12 10:55:42.000000000 -0500
@@ -73,7 +73,7 @@
 	echo 'CONFIG_LIBS="$(CONFIG_LIBS)"' >> gdal-config
 	echo 'CONFIG_DEP_LIBS="$(LIBS)"' >> gdal-config
 	echo 'CONFIG_PREFIX="$(GDAL_ROOT)"' >> gdal-config
-	echo 'CONFIG_CFLAGS="-I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore -I$(GDAL_ROOT)/alg -I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts"' >> gdal-config
+	echo 'CONFIG_CFLAGS="-I@PREFIX@/include/gdal1"' >> gdal-config
 	echo 'CONFIG_VERSION="'`cat ../VERSION`'"' >> gdal-config
 	echo 'CONFIG_OGR_ENABLED=$(OGR_ENABLED)' >> gdal-config
 	echo 'CONFIG_FORMATS="$(GDAL_FORMATS)"' >> gdal-config
@@ -86,7 +86,7 @@
 	echo 'CONFIG_LIBS="$(CONFIG_LIBS_INS)"' >> gdal-config-inst
 	echo 'CONFIG_DEP_LIBS="$(LIBS)"' >> gdal-config-inst
 	echo 'CONFIG_PREFIX="$(INST_PREFIX)"' >> gdal-config-inst
-	echo 'CONFIG_CFLAGS="-I$(INST_INCLUDE)"' >> gdal-config-inst
+	echo 'CONFIG_CFLAGS="-I@PREFIX@/include/gdal1"' >> gdal-config-inst
 	echo 'CONFIG_VERSION="'`cat ../VERSION`'"' >> gdal-config-inst
 	echo 'CONFIG_OGR_ENABLED=$(OGR_ENABLED)' >> gdal-config-inst
 	echo 'CONFIG_FORMATS="$(GDAL_FORMATS)"' >> gdal-config-inst
diff --new-file -u -r gdal-1.4.0.orig/frmts/ogdi/GNUmakefile gdal-1.4.0/frmts/ogdi/GNUmakefile
--- gdal-1.4.0.orig/frmts/ogdi/GNUmakefile	2006-03-24 11:51:57.000000000 -0500
+++ gdal-1.4.0/frmts/ogdi/GNUmakefile	2007-01-12 10:55:42.000000000 -0500
@@ -3,7 +3,7 @@
 
 OBJ	=	ogdidataset.o
 
-CPPFLAGS	:=	$(GDAL_INCLUDE) $(OGDI_INCLUDE) $(CPPFLAGS)
+CPPFLAGS	:=	$(CPPFLAGS) $(GDAL_INCLUDE) $(OGDI_INCLUDE)
 
 default:	$(OBJ)