--- GDALmake.opt.in.orig	2006-05-21 14:59:21.000000000 -0700
+++ GDALmake.opt.in	2006-05-21 15:13:22.000000000 -0700
@@ -54,7 +54,7 @@
 exec_prefix	=	@exec_prefix@
 INST_PREFIX	=	@exec_prefix@
 INST_INCLUDE	=	@includedir@
-INST_DATA 	=	@datadir@
+INST_DATA 	=	@datadir@/gdal
 INST_LIB	=	@libdir@
 INST_BIN	=	@bindir@
 INST_PYMOD      =       @pymoddir@
--- GNUmakefile.orig	2006-03-24 08:51:56.000000000 -0800
+++ GNUmakefile	2006-05-21 15:18:42.000000000 -0700
@@ -141,7 +141,7 @@
 
 install-docs:
 	(cd ogr; $(MAKE) install-docs)
-	$(INSTALL_DIR) $(INST_DOCS)/gdal
+	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/gdal
 	cp html/*.* $(INST_DOCS)/gdal
 
 web-update:	docs
@@ -150,9 +150,9 @@
 install:	default install-actions
 
 install-actions: install-lib
-	$(INSTALL_DIR) $(INST_BIN)
-	$(INSTALL_DIR) $(INST_DATA)
-	$(INSTALL_DIR) $(INST_INCLUDE)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
 	(cd port; $(MAKE) install)
 	(cd gcore; $(MAKE) install)
 	(cd frmts; $(MAKE) install)
@@ -166,14 +166,14 @@
 ifneq ($(BINDINGS),)
 	(cd swig; $(MAKE) install)
 endif
-	for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
+	for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
 	$(LIBTOOL_FINISH) $(INST_LIB)
 
 ifeq ($(HAVE_LIBTOOL),yes)
 
 install-lib:
-	$(INSTALL_DIR) $(INST_LIB)
-	for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(INST_LIB) ; done
+	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
+	for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(DESTDIR)$(INST_LIB) ; done
 
 else
 
@@ -183,11 +183,11 @@
 GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))
 
 install-lib:
-	$(INSTALL_DIR) $(INST_LIB)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
 	rm -f $(INST_LIB)/$(GDAL_SLIB_B)
 	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)
 	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-	$(INSTALL_LIB) $(GDAL_SLIB) $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
+	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
 	(cd $(INST_LIB) ; \
 	 ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))
 	(cd $(INST_LIB) ; \
@@ -196,8 +196,8 @@
 else
 
 install-lib:
-	$(INSTALL_DIR) $(INST_LIB)
-	$(INSTALL_LIB) $(GDAL_LIB) $(INST_LIB)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
+	$(INSTALL_LIB) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
 
 endif # HAVE_LD_SHARED=no 
 
--- alg/GNUmakefile.orig	2006-03-24 08:51:56.000000000 -0800
+++ alg/GNUmakefile	2006-05-21 15:19:29.000000000 -0700
@@ -22,7 +22,7 @@
 	(cd ..; $(MAKE) docs)
 
 install:
-	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
+	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
 
 lib:	$(OBJ)
 	(cd .. ; $(MAKE) force-lib)
--- apps/GNUmakefile.orig	2006-03-24 08:51:56.000000000 -0800
+++ apps/GNUmakefile	2006-05-21 15:20:41.000000000 -0700
@@ -95,6 +95,6 @@
 
 
 install: default
-	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done
-	$(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config
+	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
+	$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
 
--- frmts/mem/GNUmakefile.orig	2006-03-24 08:51:57.000000000 -0800
+++ frmts/mem/GNUmakefile	2006-05-21 15:21:37.000000000 -0700
@@ -14,4 +14,4 @@
 install-obj:	$(O_OBJ)
 
 install:
-	$(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
+	$(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
--- frmts/raw/GNUmakefile.orig	2006-04-03 21:54:51.000000000 -0700
+++ frmts/raw/GNUmakefile	2006-05-21 15:22:18.000000000 -0700
@@ -20,4 +20,4 @@
 $(OBJ) $(O_OBJ):	rawdataset.h
 
 install:
-	$(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
+	$(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
--- frmts/vrt/GNUmakefile.orig	2006-03-24 08:51:57.000000000 -0800
+++ frmts/vrt/GNUmakefile	2006-05-21 15:23:25.000000000 -0700
@@ -18,4 +18,4 @@
 $(OBJ) $(O_OBJ):	vrtdataset.h
 
 install:
-	$(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
+	$(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
--- gcore/GNUmakefile.orig	2006-04-06 23:59:13.000000000 -0700
+++ gcore/GNUmakefile	2006-05-21 15:24:12.000000000 -0700
@@ -34,4 +34,4 @@
 		$*.cpp -o $*.o
 
 install:
-	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
+	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
--- man/GNUmakefile.orig	2006-03-24 08:51:57.000000000 -0800
+++ man/GNUmakefile	2006-05-21 15:25:07.000000000 -0700
@@ -4,5 +4,5 @@
 include ../GDALmake.opt
 
 install:
-	$(INSTALL_DIR) $(INST_MAN)/man1
-	for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(INST_MAN)/man1 ; done
+	$(INSTALL_DIR) $(DESTDIR)$(INST_MAN)/man1
+	for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_MAN)/man1 ; done
--- ogr/GNUmakefile.orig	2006-03-24 08:51:57.000000000 -0800
+++ ogr/GNUmakefile	2006-05-21 15:27:34.000000000 -0700
@@ -81,8 +81,8 @@
 	cp ogr_feature_style.html html
 
 install-docs:
-	$(INSTALL_DIR) $(INST_DOCS)/ogr
-	cp html/* $(INST_DOCS)/ogr
+	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
+	cp html/* $(DESTDIR)$(INST_DOCS)/ogr
 	cp ../doc/ogr/*.gif $(INST_DOCS)/ogr
 
 gdalso:	$(GDAL_SLIB)
@@ -123,14 +123,14 @@
 
 ifeq ($(OGR_ENABLED),yes)
 install-full:	apps
-	$(INSTALL) ogr2ogr $(INST_BIN)
-	$(INSTALL) ogrinfo $(INST_BIN)
-	$(INSTALL) ogrtindex $(INST_BIN)
+	$(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
+	$(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
+	$(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
 else
 install-full:
 endif
 
 install:	install-full
 	for f in $(INST_H_FILES) ; \
-	    do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
+	    do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
 	done
--- port/GNUmakefile.orig	2006-03-24 08:51:58.000000000 -0800
+++ port/GNUmakefile	2006-05-21 15:28:18.000000000 -0700
@@ -25,7 +25,7 @@
 	$(RM) *.o $(LIB)
 
 install:
-	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
+	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
 
 xmlreformat:	xmlreformat.o 
 	$(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat
--- pymod/GNUmakefile.orig	2006-03-24 08:51:58.000000000 -0800
+++ pymod/GNUmakefile	2006-05-21 15:30:05.000000000 -0700
@@ -44,9 +44,9 @@
 
 # special care is taken so that python scripts are installed as executables
 install:	$(GDALMODULE_SO)
-	$(INSTALL_DIR) $(INST_PYMOD)
-	$(INSTALL_LIB) $(GDALMODULE_SO) $(INST_PYMOD)
-	for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(INST_BIN) ; done
-	for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(INST_PYMOD) ; done
+	$(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
+	$(INSTALL_LIB) $(GDALMODULE_SO) $(DESTDIR)$(INST_PYMOD)
+	for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
+	for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; done
 	# ugh! spurius relinking leaves a file owned by root into .libs/.
 	rm -f .libs/*.soT