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

--- gdal-1.1.9/GNUmakefile.orig	Wed Mar 27 22:41:45 2002
+++ gdal-1.1.9/GNUmakefile	Mon Jun 17 22:45:44 2002
@@ -114,10 +114,10 @@
 install:	lib install-actions
 
 install-actions:
-	$(INSTALL_DIR) $(INST_BIN)
-	$(INSTALL_DIR) $(INST_DATA)
-	$(INSTALL_DIR) $(INST_LIB)
-	$(INSTALL_DIR) $(INST_INCLUDE)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
 	(cd port; $(MAKE) install)
 	(cd gcore; $(MAKE) install)
 	(cd frmts; $(MAKE) install)
@@ -126,9 +126,9 @@
 ifneq ($(PYTHON),no)
 	(cd pymod; $(MAKE) install)
 endif
-	$(INSTALL_DATA) $(GDAL_LIB) $(INST_LIB)
+	$(INSTALL_DATA) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
 ifeq ($(HAVE_LD_SHARED),yes)
-	$(INSTALL_DATA) $(GDAL_SLIB) $(INST_LIB)
+	$(INSTALL) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)
 endif
-	for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
+	for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
 
--- gdal-1.1.9/ogr/GNUmakefile.orig	Fri Mar 29 00:54:26 2002
+++ gdal-1.1.9/ogr/GNUmakefile	Mon Jun 17 22:46:38 2002
@@ -123,18 +123,18 @@
 
 ifeq ($(OGR_ENABLED),yes)
 install-full:	apps
-	$(INSTALL) ogr2ogr $(INST_BIN)
-	$(INSTALL) ogrinfo $(INST_BIN)
-	$(INSTALL) ogrtindex $(INST_BIN)
-	$(INSTALL_DATA) $(OGRFRMTS_LIB) $(INST_LIB)
+	$(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
+	$(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
+	$(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
+	$(INSTALL_DATA) $(OGRFRMTS_LIB) $(DESTDIR)$(INST_LIB)
 else
 install-full:
 endif
 
 install:	$(OGR_LIB) install-full
 	for f in $(INST_H_FILES) ; \
-	    do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
+	    do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
 	done
-	$(INSTALL_DATA) $(OGR_LIB) $(INST_LIB)
+	$(INSTALL_DATA) $(OGR_LIB) $(DESTDIR)$(INST_LIB)
 
 
--- gdal-1.1.9/pymod/GNUmakefile.orig	2003-06-04 23:57:36.000000000 +0200
+++ gdal-1.1.9/pymod/GNUmakefile	2003-07-19 17:38:20.000000000 +0200
@@ -30,13 +30,13 @@
 
 # special care is taken so that python scripts are installed as executables
 install:	$(GDALMODULE)
-	$(INSTALL_DIR) $(INST_PYMOD)
-	$(INSTALL_DATA) $(GDALMODULE) $(INST_PYMOD)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
+	$(INSTALL_DATA) $(GDALMODULE) $(DESTDIR)$(INST_PYMOD)
 	for f in *.py ; do \
 	    if egrep '\#\!.*python' $$f > /dev/null ; then \
-		$(INSTALL) $$f $(INST_PYMOD) ; \
+		$(INSTALL) $$f $(DESTDIR)$(INST_PYMOD) ; \
 	    else \
-		$(INSTALL_DATA) $$f $(INST_PYMOD) ; \
+		$(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; \
 	    fi \
 	done
 
--- gdal-1.1.9/port/GNUmakefile.orig	Wed Jan 23 21:45:16 2002
+++ gdal-1.1.9/port/GNUmakefile	Mon Jun 17 22:48:41 2002
@@ -33,8 +33,8 @@
 	$(RANLIB) $(LIB)
 
 install:	$(LIB)
-	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
-	$(INSTALL_DATA) cpl.a $(INST_LIB)
+	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
+	$(INSTALL_DATA) cpl.a $(DESTDIR)$(INST_LIB)
 
 xmlreformat:	xmlreformat.o $(LIB)
 	$(CXX) $(CXXFLAGS) xmlreformat.o $(LIB) -o xmlreformat
--- gdal-1.1.9/alg/GNUmakefile.orig	Thu Mar 15 04:17:34 2001
+++ gdal-1.1.9/alg/GNUmakefile	Mon Jun 17 22:49:24 2002
@@ -19,7 +19,7 @@
 	$(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.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
 
 lib:	$(OBJ)
 (cd .. ; $(MAKE) force-lib)
--- gdal-1.1.7/apps/GNUmakefile.orig	Wed Nov  7 04:49:16 2001
+++ gdal-1.1.7/apps/GNUmakefile	Mon Jun 17 22:50:06 2002
@@ -86,6 +86,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.1.9/gcore/GNUmakefile.orig	Wed Nov 21 04:16:47 2001
+++ gdal-1.1.9/gcore/GNUmakefile	Mon Jun 17 22:50:30 2002
@@ -26,4 +26,4 @@
 	$(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.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
Commit	Line	Data
3a591acf JB	1	--- gdal-1.1.9/GNUmakefile.orig Wed Mar 27 22:41:45 2002
3a591acf JB	2	+++ gdal-1.1.9/GNUmakefile Mon Jun 17 22:45:44 2002
faf5649c JB	3	@@ -114,10 +114,10 @@
	4	install: lib install-actions
	5
	6	install-actions:
	7	- $(INSTALL_DIR) $(INST_BIN)
	8	- $(INSTALL_DIR) $(INST_DATA)
	9	- $(INSTALL_DIR) $(INST_LIB)
	10	- $(INSTALL_DIR) $(INST_INCLUDE)
	11	+ $(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
	12	+ $(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
	13	+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
	14	+ $(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
	15	(cd port; $(MAKE) install)
3a591acf	16	(cd gcore; $(MAKE) install)
faf5649c	17	(cd frmts; $(MAKE) install)
6b59fa88	18	@@ -126,9 +126,9 @@
faf5649c JB	19	ifneq ($(PYTHON),no)
	20	(cd pymod; $(MAKE) install)
	21	endif
3a591acf JB	22	- $(INSTALL_DATA) $(GDAL_LIB) $(INST_LIB)
3a591acf JB	23	+ $(INSTALL_DATA) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
faf5649c	24	ifeq ($(HAVE_LD_SHARED),yes)
3a591acf	25	- $(INSTALL_DATA) $(GDAL_SLIB) $(INST_LIB)
faf5649c JB	26	+ $(INSTALL) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)
faf5649c JB	27	endif
3a591acf JB	28	- for f in data/. ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
3a591acf JB	29	+ for f in data/. ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
6b59fa88	30
3a591acf JB	31	--- gdal-1.1.9/ogr/GNUmakefile.orig Fri Mar 29 00:54:26 2002
	32	+++ gdal-1.1.9/ogr/GNUmakefile Mon Jun 17 22:46:38 2002
	33	@@ -123,18 +123,18 @@
faf5649c JB	34
faf5649c JB	35	ifeq ($(OGR_ENABLED),yes)
3a591acf	36	install-full: apps
faf5649c JB	37	- $(INSTALL) ogr2ogr $(INST_BIN)
	38	- $(INSTALL) ogrinfo $(INST_BIN)
	39	- $(INSTALL) ogrtindex $(INST_BIN)
3a591acf	40	- $(INSTALL_DATA) $(OGRFRMTS_LIB) $(INST_LIB)
faf5649c JB	41	+ $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
	42	+ $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
	43	+ $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
3a591acf	44	+ $(INSTALL_DATA) $(OGRFRMTS_LIB) $(DESTDIR)$(INST_LIB)
faf5649c JB	45	else
	46	install-full:
	47	endif
	48
	49	install: $(OGR_LIB) install-full
3a591acf JB	50	for f in $(INST_H_FILES) ; \
	51	- do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
	52	+ do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
	53	done
	54	- $(INSTALL_DATA) $(OGR_LIB) $(INST_LIB)
	55	+ $(INSTALL_DATA) $(OGR_LIB) $(DESTDIR)$(INST_LIB)
faf5649c JB	56
faf5649c JB	57
3a591acf JB	58	--- gdal-1.1.9/pymod/GNUmakefile.orig 2003-06-04 23:57:36.000000000 +0200
	59	+++ gdal-1.1.9/pymod/GNUmakefile 2003-07-19 17:38:20.000000000 +0200
	60	@@ -30,13 +30,13 @@
faf5649c	61
3a591acf JB	62	# special care is taken so that python scripts are installed as executables
3a591acf JB	63	install: $(GDALMODULE)
faf5649c	64	- $(INSTALL_DIR) $(INST_PYMOD)
3a591acf	65	- $(INSTALL_DATA) $(GDALMODULE) $(INST_PYMOD)
faf5649c	66	+ $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
3a591acf JB	67	+ $(INSTALL_DATA) $(GDALMODULE) $(DESTDIR)$(INST_PYMOD)
	68	for f in *.py ; do \
	69	if egrep '\#\!.*python' $$f > /dev/null ; then \
	70	- $(INSTALL) $$f $(INST_PYMOD) ; \
	71	+ $(INSTALL) $$f $(DESTDIR)$(INST_PYMOD) ; \
	72	else \
	73	- $(INSTALL_DATA) $$f $(INST_PYMOD) ; \
	74	+ $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; \
	75	fi \
	76	done
	77
	78	--- gdal-1.1.9/port/GNUmakefile.orig Wed Jan 23 21:45:16 2002
	79	+++ gdal-1.1.9/port/GNUmakefile Mon Jun 17 22:48:41 2002
faf5649c JB	80	@@ -33,8 +33,8 @@
	81	$(RANLIB) $(LIB)
	82
	83	install: $(LIB)
3a591acf JB	84	- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
	85	- $(INSTALL_DATA) cpl.a $(INST_LIB)
	86	+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
	87	+ $(INSTALL_DATA) cpl.a $(DESTDIR)$(INST_LIB)
faf5649c JB	88
faf5649c JB	89	xmlreformat: xmlreformat.o $(LIB)
3a591acf JB	90	$(CXX) $(CXXFLAGS) xmlreformat.o $(LIB) -o xmlreformat
	91	--- gdal-1.1.9/alg/GNUmakefile.orig Thu Mar 15 04:17:34 2001
	92	+++ gdal-1.1.9/alg/GNUmakefile Mon Jun 17 22:49:24 2002
	93	@@ -19,7 +19,7 @@
faf5649c JB	94	$(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $.cpp -o $.o
	95
	96	install:
3a591acf JB	97	- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
	98	+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
	99
	100	lib: $(OBJ)
	101	(cd .. ; $(MAKE) force-lib)
faf5649c JB	102	--- gdal-1.1.7/apps/GNUmakefile.orig Wed Nov 7 04:49:16 2001
	103	+++ gdal-1.1.7/apps/GNUmakefile Mon Jun 17 22:50:06 2002
	104	@@ -86,6 +86,6 @@
	105
	106
	107	install: default
	108	- for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done
	109	- $(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config
	110	+ for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
	111	+ $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
	112
3a591acf JB	113	--- gdal-1.1.9/gcore/GNUmakefile.orig Wed Nov 21 04:16:47 2001
3a591acf JB	114	+++ gdal-1.1.9/gcore/GNUmakefile Mon Jun 17 22:50:30 2002
faf5649c JB	115	@@ -26,4 +26,4 @@
	116	$(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $.cpp -o $.o
	117
	118	install:
3a591acf JB	119	- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
3a591acf JB	120	+ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done