[packages/gdal.git] / gdal-DESTDIR.patch

--- gdal-1.3.2/GNUmakefile.orig	2006-03-24 17:51:56.000000000 +0100
+++ gdal-1.3.2/GNUmakefile	2006-05-29 07:38:45.280728750 +0200
@@ -141,8 +141,8 @@
 
 install-docs:
 	(cd ogr; $(MAKE) install-docs)
-	$(INSTALL_DIR) $(INST_DOCS)/gdal
-	cp html/*.* $(INST_DOCS)/gdal
+	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/gdal
+	cp html/*.* $(DESTDIR)$(INST_DOCS)/gdal
 
 web-update:	docs
 	cp html/*.* $(WEB_DIR)
@@ -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
-	$(LIBTOOL_FINISH) $(INST_LIB)
+	for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
+	$(LIBTOOL_FINISH) $(DESTDIR)$(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,21 +183,21 @@
 GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))
 
 install-lib:
-	$(INSTALL_DIR) $(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)
-	(cd $(INST_LIB) ; \
+	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)
+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
+	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
+	(cd $(DESTDIR)$(INST_LIB) ; \
 	 ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))
-	(cd $(INST_LIB) ; \
+	(cd $(DESTDIR)$(INST_LIB) ; \
 	 ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VER_MAJOR))
 
 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 
 
--- gdal-1.3.2/ogr/GNUmakefile.orig	2006-03-24 17:51:57.000000000 +0100
+++ gdal-1.3.2/ogr/GNUmakefile	2006-05-29 07:39:20.254914500 +0200
@@ -81,9 +81,9 @@
 	cp ogr_feature_style.html html
 
 install-docs:
-	$(INSTALL_DIR) $(INST_DOCS)/ogr
-	cp html/* $(INST_DOCS)/ogr
-	cp ../doc/ogr/*.gif $(INST_DOCS)/ogr
+	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
+	cp html/* $(DESTDIR)$(INST_DOCS)/ogr
+	cp ../doc/ogr/*.gif $(DESTDIR)$(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
--- gdal-1.2.6/pymod/GNUmakefile.orig	2005-01-31 23:07:02.000000000 +0100
+++ gdal-1.2.6/pymod/GNUmakefile	2005-03-28 23:55:02.370967240 +0200
@@ -45,9 +45,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
--- gdal-1.2.0/port/GNUmakefile.orig	2003-12-28 18:25:00.000000000 +0100
+++ gdal-1.2.0/port/GNUmakefile	2004-04-07 22:00:08.007464384 +0200
@@ -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
--- gdal-1.2.0/alg/GNUmakefile.orig	2003-12-16 12:13:25.000000000 +0100
+++ gdal-1.2.0/alg/GNUmakefile	2004-04-07 21:55:34.476047480 +0200
@@ -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)
--- gdal-1.2.0/apps/GNUmakefile.orig	2004-02-21 15:31:38.000000000 +0100
+++ gdal-1.2.0/apps/GNUmakefile	2004-04-07 21:55:34.478047176 +0200
@@ -92,6 +92,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
 
--- gdal-1.2.0/gcore/GNUmakefile.orig	2003-12-16 12:13:46.000000000 +0100
+++ gdal-1.2.0/gcore/GNUmakefile	2004-04-07 21:55:34.479047024 +0200
@@ -31,4 +31,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
--- gdal-1.2.0/man/GNUmakefile.orig	2004-02-20 18:26:13.000000000 +0100
+++ gdal-1.2.0/man/GNUmakefile	2004-04-07 22:01:23.370007536 +0200
@@ -5,5 +5,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
--- gdal-1.2.6/frmts/vrt/GNUmakefile.orig	2005-01-24 19:09:57.000000000 +0100
+++ gdal-1.2.6/frmts/vrt/GNUmakefile	2005-03-29 00:56:45.822956960 +0200
@@ -19,4 +19,4 @@
 $(OBJ) $(O_OBJ):	vrtdataset.h
 
 install:
-	$(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
+	$(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
--- gdal-1.2.6/frmts/mem/GNUmakefile.orig	2005-01-24 19:09:57.000000000 +0100
+++ gdal-1.2.6/frmts/mem/GNUmakefile	2005-03-29 01:59:50.803552448 +0200
@@ -15,4 +15,4 @@
 install-obj:	$(O_OBJ)
 
 install:
-	$(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
+	$(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
--- gdal-1.2.6/frmts/raw/GNUmakefile.orig	2005-01-24 19:09:57.000000000 +0100
+++ gdal-1.2.6/frmts/raw/GNUmakefile	2005-03-29 09:59:16.200547408 +0200
@@ -21,4 +21,4 @@
 $(OBJ) $(O_OBJ):	rawdataset.h
 
 install:
-	$(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
+	$(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
--- gdal-1.3.2/swig/python/GNUmakefile.orig	2006-03-24 17:51:58.000000000 +0100
+++ gdal-1.3.2/swig/python/GNUmakefile	2006-05-29 07:39:37.868015250 +0200
@@ -24,4 +24,4 @@
 	python setup.py build
 
 install:
-	python setup.py install --prefix=$(prefix)
+	python setup.py install --prefix=$(DESTDIR)$(prefix)
--- gdal-1.3.2/swig/ruby/RubyMakefile.mk.orig	2006-01-14 02:48:46.000000000 +0100
+++ gdal-1.3.2/swig/ruby/RubyMakefile.mk	2006-05-29 07:40:11.162096000 +0200
@@ -38,11 +38,11 @@
 veryclean: clean
 	rm -frd $(INSTALL_DIR)
 
-$(INSTALL_DIR):
-	mkdir -v $(INSTALL_DIR)
+$(DESTDIR)$(INSTALL_DIR):
+	mkdir -v $(DESTDIR)$(INSTALL_DIR)
 
-install: $(INSTALL_DIR)
-	$(INSTALL) $(RUBY_MODULES) $(INSTALL_DIR) 
+install: $(DESTDIR)$(INSTALL_DIR)
+	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
 
 $(RUBY_MODULES): %.so: %_wrap.o
 	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
Commit	Line	Data
54f462a8 JB	1	--- gdal-1.3.2/GNUmakefile.orig 2006-03-24 17:51:56.000000000 +0100
	2	+++ gdal-1.3.2/GNUmakefile 2006-05-29 07:38:45.280728750 +0200
	3	@@ -141,8 +141,8 @@
dadc3fa6 JB	4
	5	install-docs:
	6	(cd ogr; $(MAKE) install-docs)
	7	- $(INSTALL_DIR) $(INST_DOCS)/gdal
	8	- cp html/. $(INST_DOCS)/gdal
	9	+ $(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/gdal
	10	+ cp html/. $(DESTDIR)$(INST_DOCS)/gdal
	11
	12	web-update: docs
	13	cp html/. $(WEB_DIR)
54f462a8	14	@@ -150,9 +150,9 @@
dadc3fa6 JB	15	install: default install-actions
	16
	17	install-actions: install-lib
faf5649c JB	18	- $(INSTALL_DIR) $(INST_BIN)
faf5649c JB	19	- $(INSTALL_DIR) $(INST_DATA)
faf5649c JB	20	- $(INSTALL_DIR) $(INST_INCLUDE)
	21	+ $(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
	22	+ $(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
faf5649c JB	23	+ $(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
faf5649c JB	24	(cd port; $(MAKE) install)
3a591acf	25	(cd gcore; $(MAKE) install)
faf5649c	26	(cd frmts; $(MAKE) install)
54f462a8 JB	27	@@ -166,14 +166,14 @@
54f462a8 JB	28	ifneq ($(BINDINGS),)
f5fa9685	29	(cd swig; $(MAKE) install)
54f462a8	30	endif
3a591acf	31	- for f in data/. ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
dadc3fa6	32	- $(LIBTOOL_FINISH) $(INST_LIB)
3a591acf	33	+ for f in data/. ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
dadc3fa6 JB	34	+ $(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
	35
	36	ifeq ($(HAVE_LIBTOOL),yes)
	37
	38	install-lib:
	39	- $(INSTALL_DIR) $(INST_LIB)
	40	- for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(INST_LIB) ; done
	41	+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
	42	+ for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(DESTDIR)$(INST_LIB) ; done
	43
	44	else
	45
54f462a8	46	@@ -183,21 +183,21 @@
dadc3fa6 JB	47	GDAL_SLIB_B = $(notdir $(GDAL_SLIB))
	48
	49	install-lib:
	50	- $(INSTALL_DIR) $(INST_LIB)
	51	- rm -f $(INST_LIB)/$(GDAL_SLIB_B)
	52	- rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)
	53	- rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
	54	- $(INSTALL_LIB) $(GDAL_SLIB) $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
	55	- (cd $(INST_LIB) ; \
	56	+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
	57	+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
	58	+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)
	59	+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
	60	+ $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
	61	+ (cd $(DESTDIR)$(INST_LIB) ; \
	62	ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))
	63	- (cd $(INST_LIB) ; \
	64	+ (cd $(DESTDIR)$(INST_LIB) ; \
	65	ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VER_MAJOR))
	66
	67	else
	68
	69	install-lib:
	70	- $(INSTALL_DIR) $(INST_LIB)
	71	- $(INSTALL_LIB) $(GDAL_LIB) $(INST_LIB)
	72	+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
	73	+ $(INSTALL_LIB) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
	74
	75	endif # HAVE_LD_SHARED=no
	76
54f462a8 JB	77	--- gdal-1.3.2/ogr/GNUmakefile.orig 2006-03-24 17:51:57.000000000 +0100
	78	+++ gdal-1.3.2/ogr/GNUmakefile 2006-05-29 07:39:20.254914500 +0200
	79	@@ -81,9 +81,9 @@
	80	cp ogr_feature_style.html html
dadc3fa6 JB	81
	82	install-docs:
	83	- $(INSTALL_DIR) $(INST_DOCS)/ogr
	84	- cp html/* $(INST_DOCS)/ogr
54f462a8	85	- cp ../doc/ogr/*.gif $(INST_DOCS)/ogr
dadc3fa6 JB	86	+ $(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
dadc3fa6 JB	87	+ cp html/* $(DESTDIR)$(INST_DOCS)/ogr
54f462a8	88	+ cp ../doc/ogr/*.gif $(DESTDIR)$(INST_DOCS)/ogr
dadc3fa6 JB	89
dadc3fa6 JB	90	gdalso: $(GDAL_SLIB)
6b59fa88	91
54f462a8	92	@@ -123,14 +123,14 @@
faf5649c JB	93
faf5649c JB	94	ifeq ($(OGR_ENABLED),yes)
3a591acf	95	install-full: apps
faf5649c JB	96	- $(INSTALL) ogr2ogr $(INST_BIN)
	97	- $(INSTALL) ogrinfo $(INST_BIN)
	98	- $(INSTALL) ogrtindex $(INST_BIN)
faf5649c JB	99	+ $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
	100	+ $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
	101	+ $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
faf5649c JB	102	else
	103	install-full:
	104	endif
	105
dadc3fa6	106	install: install-full
3a591acf JB	107	for f in $(INST_H_FILES) ; \
	108	- do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
	109	+ do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
	110	done
34c8e030 JB	111	--- gdal-1.2.6/pymod/GNUmakefile.orig 2005-01-31 23:07:02.000000000 +0100
	112	+++ gdal-1.2.6/pymod/GNUmakefile 2005-03-28 23:55:02.370967240 +0200
	113	@@ -45,9 +45,9 @@
faf5649c	114
3a591acf	115	# special care is taken so that python scripts are installed as executables
34c8e030	116	install: $(GDALMODULE_SO)
faf5649c	117	- $(INSTALL_DIR) $(INST_PYMOD)
34c8e030	118	- $(INSTALL_LIB) $(GDALMODULE_SO) $(INST_PYMOD)
dadc3fa6 JB	119	- for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(INST_BIN) ; done
dadc3fa6 JB	120	- for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(INST_PYMOD) ; done
faf5649c	121	+ $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
34c8e030	122	+ $(INSTALL_LIB) $(GDALMODULE_SO) $(DESTDIR)$(INST_PYMOD)
dadc3fa6 JB	123	+ for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
	124	+ for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; done
	125	# ugh! spurius relinking leaves a file owned by root into .libs/.
	126	rm -f .libs/*.soT
	127	--- gdal-1.2.0/port/GNUmakefile.orig 2003-12-28 18:25:00.000000000 +0100
	128	+++ gdal-1.2.0/port/GNUmakefile 2004-04-07 22:00:08.007464384 +0200
	129	@@ -25,7 +25,7 @@
	130	$(RM) *.o $(LIB)
faf5649c	131
dadc3fa6	132	install:
3a591acf	133	- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
3a591acf	134	+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
faf5649c	135
dadc3fa6 JB	136	xmlreformat: xmlreformat.o
	137	$(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat
	138	--- gdal-1.2.0/alg/GNUmakefile.orig 2003-12-16 12:13:25.000000000 +0100
	139	+++ gdal-1.2.0/alg/GNUmakefile 2004-04-07 21:55:34.476047480 +0200
	140	@@ -22,7 +22,7 @@
	141	(cd ..; $(MAKE) docs)
faf5649c JB	142
faf5649c JB	143	install:
3a591acf JB	144	- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
	145	+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
	146
	147	lib: $(OBJ)
dadc3fa6 JB	148	(cd .. ; $(MAKE) force-lib)
	149	--- gdal-1.2.0/apps/GNUmakefile.orig 2004-02-21 15:31:38.000000000 +0100
	150	+++ gdal-1.2.0/apps/GNUmakefile 2004-04-07 21:55:34.478047176 +0200
	151	@@ -92,6 +92,6 @@
faf5649c JB	152
	153
	154	install: default
	155	- for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done
	156	- $(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config
	157	+ for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
	158	+ $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
	159
dadc3fa6 JB	160	--- gdal-1.2.0/gcore/GNUmakefile.orig 2003-12-16 12:13:46.000000000 +0100
	161	+++ gdal-1.2.0/gcore/GNUmakefile 2004-04-07 21:55:34.479047024 +0200
	162	@@ -31,4 +31,4 @@
	163	$.cpp -o $.o
faf5649c JB	164
faf5649c JB	165	install:
3a591acf JB	166	- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
3a591acf JB	167	+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
dadc3fa6 JB	168	--- gdal-1.2.0/man/GNUmakefile.orig 2004-02-20 18:26:13.000000000 +0100
	169	+++ gdal-1.2.0/man/GNUmakefile 2004-04-07 22:01:23.370007536 +0200
	170	@@ -5,5 +5,5 @@
	171	include ../GDALmake.opt
	172
	173	install:
	174	- $(INSTALL_DIR) $(INST_MAN)/man1
	175	- for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(INST_MAN)/man1 ; done
	176	+ $(INSTALL_DIR) $(DESTDIR)$(INST_MAN)/man1
	177	+ for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_MAN)/man1 ; done
34c8e030 JB	178	--- gdal-1.2.6/frmts/vrt/GNUmakefile.orig 2005-01-24 19:09:57.000000000 +0100
	179	+++ gdal-1.2.6/frmts/vrt/GNUmakefile 2005-03-29 00:56:45.822956960 +0200
	180	@@ -19,4 +19,4 @@
	181	$(OBJ) $(O_OBJ): vrtdataset.h
	182
	183	install:
	184	- $(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
	185	+ $(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
	186	--- gdal-1.2.6/frmts/mem/GNUmakefile.orig 2005-01-24 19:09:57.000000000 +0100
	187	+++ gdal-1.2.6/frmts/mem/GNUmakefile 2005-03-29 01:59:50.803552448 +0200
	188	@@ -15,4 +15,4 @@
	189	install-obj: $(O_OBJ)
	190
	191	install:
	192	- $(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
	193	+ $(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
	194	--- gdal-1.2.6/frmts/raw/GNUmakefile.orig 2005-01-24 19:09:57.000000000 +0100
	195	+++ gdal-1.2.6/frmts/raw/GNUmakefile 2005-03-29 09:59:16.200547408 +0200
	196	@@ -21,4 +21,4 @@
	197	$(OBJ) $(O_OBJ): rawdataset.h
	198
	199	install:
	200	- $(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
	201	+ $(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
54f462a8 JB	202	--- gdal-1.3.2/swig/python/GNUmakefile.orig 2006-03-24 17:51:58.000000000 +0100
	203	+++ gdal-1.3.2/swig/python/GNUmakefile 2006-05-29 07:39:37.868015250 +0200
	204	@@ -24,4 +24,4 @@
f5fa9685 JB	205	python setup.py build
f5fa9685 JB	206
54f462a8	207	install:
f5fa9685 JB	208	- python setup.py install --prefix=$(prefix)
f5fa9685 JB	209	+ python setup.py install --prefix=$(DESTDIR)$(prefix)
54f462a8 JB	210	--- gdal-1.3.2/swig/ruby/RubyMakefile.mk.orig 2006-01-14 02:48:46.000000000 +0100
	211	+++ gdal-1.3.2/swig/ruby/RubyMakefile.mk 2006-05-29 07:40:11.162096000 +0200
	212	@@ -38,11 +38,11 @@
	213	veryclean: clean
f5fa9685 JB	214	rm -frd $(INSTALL_DIR)
f5fa9685 JB	215
54f462a8	216	-$(INSTALL_DIR):
f5fa9685	217	- mkdir -v $(INSTALL_DIR)
54f462a8	218	+$(DESTDIR)$(INSTALL_DIR):
f5fa9685 JB	219	+ mkdir -v $(DESTDIR)$(INSTALL_DIR)
f5fa9685 JB	220
54f462a8 JB	221	-install: $(INSTALL_DIR)
	222	- $(INSTALL) $(RUBY_MODULES) $(INSTALL_DIR)
	223	+install: $(DESTDIR)$(INSTALL_DIR)
	224	+ $(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR)
f5fa9685 JB	225
f5fa9685 JB	226	$(RUBY_MODULES): %.so: %_wrap.o
54f462a8	227	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@