summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
authorsibel <lesibel at free dot fr>2010-06-24 18:15:00 +0200
committersibel <lesibel at free dot fr>2010-06-24 18:15:00 +0200
commitf23ed5e06efcde55c7306bdcfd5d508b5f233ecf (patch)
treec638c9635eef7d2573b4740ae280660c7aedef48 /extra
parentded98e543c40bad21338dd92ed5e61d6d35a728d (diff)
downloadnutyx-pakxe-f23ed5e06efcde55c7306bdcfd5d508b5f233ecf.tar.gz
nutyx-pakxe-f23ed5e06efcde55c7306bdcfd5d508b5f233ecf.tar.bz2
nutyx-pakxe-f23ed5e06efcde55c7306bdcfd5d508b5f233ecf.tar.xz
nutyx-pakxe-f23ed5e06efcde55c7306bdcfd5d508b5f233ecf.zip
gdal, déplacé dans test
Diffstat (limited to 'extra')
-rw-r--r--extra/gdal/.footprint114
-rw-r--r--extra/gdal/.md5sum1
-rw-r--r--extra/gdal/Pkgfile19
-rw-r--r--extra/gdal/gdal-1.5.1-python-install.patch14
-rw-r--r--extra/gdal/gdal-destdir.patch212
-rw-r--r--extra/gdal/gdal-gcc4.patch19
6 files changed, 0 insertions, 379 deletions
diff --git a/extra/gdal/.footprint b/extra/gdal/.footprint
deleted file mode 100644
index 5c90886c8..000000000
--- a/extra/gdal/.footprint
+++ /dev/null
@@ -1,114 +0,0 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/bin/
--rwxr-xr-x root/root usr/bin/gdal-config
--rwxr-xr-x root/root usr/bin/gdal_contour
--rwxr-xr-x root/root usr/bin/gdal_grid
--rwxr-xr-x root/root usr/bin/gdal_rasterize
--rwxr-xr-x root/root usr/bin/gdal_translate
--rwxr-xr-x root/root usr/bin/gdaladdo
--rwxr-xr-x root/root usr/bin/gdalbuildvrt
--rwxr-xr-x root/root usr/bin/gdaldem
--rwxr-xr-x root/root usr/bin/gdalenhance
--rwxr-xr-x root/root usr/bin/gdalinfo
--rwxr-xr-x root/root usr/bin/gdalmanage
--rwxr-xr-x root/root usr/bin/gdaltindex
--rwxr-xr-x root/root usr/bin/gdaltransform
--rwxr-xr-x root/root usr/bin/gdalwarp
--rwxr-xr-x root/root usr/bin/nearblack
--rwxr-xr-x root/root usr/bin/ogr2ogr
--rwxr-xr-x root/root usr/bin/ogrinfo
--rwxr-xr-x root/root usr/bin/ogrtindex
--rwxr-xr-x root/root usr/bin/testepsg
-drwxr-xr-x root/root usr/include/
--rw-r--r-- root/root usr/include/cpl_atomic_ops.h
--rw-r--r-- root/root usr/include/cpl_config.h
--rw-r--r-- root/root usr/include/cpl_config_extras.h
--rw-r--r-- root/root usr/include/cpl_conv.h
--rw-r--r-- root/root usr/include/cpl_csv.h
--rw-r--r-- root/root usr/include/cpl_error.h
--rw-r--r-- root/root usr/include/cpl_hash_set.h
--rw-r--r-- root/root usr/include/cpl_http.h
--rw-r--r-- root/root usr/include/cpl_list.h
--rw-r--r-- root/root usr/include/cpl_minixml.h
--rw-r--r-- root/root usr/include/cpl_minizip_ioapi.h
--rw-r--r-- root/root usr/include/cpl_minizip_unzip.h
--rw-r--r-- root/root usr/include/cpl_multiproc.h
--rw-r--r-- root/root usr/include/cpl_odbc.h
--rw-r--r-- root/root usr/include/cpl_port.h
--rw-r--r-- root/root usr/include/cpl_quad_tree.h
--rw-r--r-- root/root usr/include/cpl_string.h
--rw-r--r-- root/root usr/include/cpl_time.h
--rw-r--r-- root/root usr/include/cpl_vsi.h
--rw-r--r-- root/root usr/include/cpl_vsi_virtual.h
--rw-r--r-- root/root usr/include/cpl_win32ce_api.h
--rw-r--r-- root/root usr/include/cpl_wince.h
--rw-r--r-- root/root usr/include/cplkeywordparser.h
--rw-r--r-- root/root usr/include/gdal.h
--rw-r--r-- root/root usr/include/gdal_alg.h
--rw-r--r-- root/root usr/include/gdal_alg_priv.h
--rw-r--r-- root/root usr/include/gdal_frmts.h
--rw-r--r-- root/root usr/include/gdal_pam.h
--rw-r--r-- root/root usr/include/gdal_priv.h
--rw-r--r-- root/root usr/include/gdal_proxy.h
--rw-r--r-- root/root usr/include/gdal_rat.h
--rw-r--r-- root/root usr/include/gdal_version.h
--rw-r--r-- root/root usr/include/gdal_vrt.h
--rw-r--r-- root/root usr/include/gdalgrid.h
--rw-r--r-- root/root usr/include/gdaljp2metadata.h
--rw-r--r-- root/root usr/include/gdalwarper.h
--rw-r--r-- root/root usr/include/gvgcpfit.h
--rw-r--r-- root/root usr/include/memdataset.h
--rw-r--r-- root/root usr/include/ogr_api.h
--rw-r--r-- root/root usr/include/ogr_core.h
--rw-r--r-- root/root usr/include/ogr_feature.h
--rw-r--r-- root/root usr/include/ogr_featurestyle.h
--rw-r--r-- root/root usr/include/ogr_geometry.h
--rw-r--r-- root/root usr/include/ogr_p.h
--rw-r--r-- root/root usr/include/ogr_spatialref.h
--rw-r--r-- root/root usr/include/ogr_srs_api.h
--rw-r--r-- root/root usr/include/ogrsf_frmts.h
--rw-r--r-- root/root usr/include/rawdataset.h
--rw-r--r-- root/root usr/include/thinplatespline.h
--rw-r--r-- root/root usr/include/vrtdataset.h
-drwxr-xr-x root/root usr/lib/
--rw-r--r-- root/root usr/lib/libgdal.a
--rwxr-xr-x root/root usr/lib/libgdal.la
-lrwxrwxrwx root/root usr/lib/libgdal.so -> libgdal.so.1.14.1
-lrwxrwxrwx root/root usr/lib/libgdal.so.1 -> libgdal.so.1.14.1
--rwxr-xr-x root/root usr/lib/libgdal.so.1.14.1
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/gdal/
--rw-r--r-- root/root usr/share/gdal/GDALLogoBW.svg
--rw-r--r-- root/root usr/share/gdal/GDALLogoColor.svg
--rw-r--r-- root/root usr/share/gdal/GDALLogoGS.svg
--rw-r--r-- root/root usr/share/gdal/LICENSE.TXT
--rw-r--r-- root/root usr/share/gdal/coordinate_axis.csv
--rw-r--r-- root/root usr/share/gdal/cubewerx_extra.wkt
--rw-r--r-- root/root usr/share/gdal/ecw_cs.wkt
--rw-r--r-- root/root usr/share/gdal/ellipsoid.csv
--rw-r--r-- root/root usr/share/gdal/epsg.wkt
--rw-r--r-- root/root usr/share/gdal/esri_extra.wkt
--rw-r--r-- root/root usr/share/gdal/gcs.csv
--rw-r--r-- root/root usr/share/gdal/gcs.override.csv
--rw-r--r-- root/root usr/share/gdal/gdal_datum.csv
--rw-r--r-- root/root usr/share/gdal/gdalicon.png
--rw-r--r-- root/root usr/share/gdal/gt_datum.csv
--rw-r--r-- root/root usr/share/gdal/gt_ellips.csv
--rw-r--r-- root/root usr/share/gdal/header.dxf
--rw-r--r-- root/root usr/share/gdal/pcs.csv
--rw-r--r-- root/root usr/share/gdal/pcs.override.csv
--rw-r--r-- root/root usr/share/gdal/prime_meridian.csv
--rw-r--r-- root/root usr/share/gdal/projop_wparm.csv
--rw-r--r-- root/root usr/share/gdal/s57agencies.csv
--rw-r--r-- root/root usr/share/gdal/s57attributes.csv
--rw-r--r-- root/root usr/share/gdal/s57attributes_aml.csv
--rw-r--r-- root/root usr/share/gdal/s57attributes_iw.csv
--rw-r--r-- root/root usr/share/gdal/s57expectedinput.csv
--rw-r--r-- root/root usr/share/gdal/s57objectclasses.csv
--rw-r--r-- root/root usr/share/gdal/s57objectclasses_aml.csv
--rw-r--r-- root/root usr/share/gdal/s57objectclasses_iw.csv
--rw-r--r-- root/root usr/share/gdal/seed_2d.dgn
--rw-r--r-- root/root usr/share/gdal/seed_3d.dgn
--rw-r--r-- root/root usr/share/gdal/stateplane.csv
--rw-r--r-- root/root usr/share/gdal/trailer.dxf
--rw-r--r-- root/root usr/share/gdal/unit_of_measure.csv
diff --git a/extra/gdal/.md5sum b/extra/gdal/.md5sum
deleted file mode 100644
index c76945eaf..000000000
--- a/extra/gdal/.md5sum
+++ /dev/null
@@ -1 +0,0 @@
-5a90be385613730cc12fcf3f59b89de6 gdal-1.7.1.tar.gz
diff --git a/extra/gdal/Pkgfile b/extra/gdal/Pkgfile
deleted file mode 100644
index 784597364..000000000
--- a/extra/gdal/Pkgfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Description: A translator library for raster geospatial data formats
-# URL: http://www.gdal.org
-# Maintainer: NuTyX core team
-# Packager: lesibel at free dot fr
-
-name=gdal
-version=1.7.1
-release=1
-source=(http://download.osgeo.org/$name/$name-$version.tar.gz)
-
-build() {
- cd $name-$version
- ./configure --prefix=/usr \
- --disable-nls
-
- make
- make DESTDIR=$PKG install
-}
-
diff --git a/extra/gdal/gdal-1.5.1-python-install.patch b/extra/gdal/gdal-1.5.1-python-install.patch
deleted file mode 100644
index fd1b7e488..000000000
--- a/extra/gdal/gdal-1.5.1-python-install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- swig/python/GNUmakefile.orig 2008-02-02 17:00:52.000000000 -0800
-+++ swig/python/GNUmakefile 2008-02-02 17:02:03.000000000 -0800
-@@ -51,9 +51,9 @@
- install:
-
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
-- $(PYTHON) setup.py install
-+ $(PYTHON) setup.py install --root=$(DESTDIR)
- else
-- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- endif
-
- for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
diff --git a/extra/gdal/gdal-destdir.patch b/extra/gdal/gdal-destdir.patch
deleted file mode 100644
index 28ef4319d..000000000
--- a/extra/gdal/gdal-destdir.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-diff -Naur gdal-1.3.2-orig/GNUmakefile gdal-1.3.2/GNUmakefile
---- gdal-1.3.2-orig/GNUmakefile 2006-11-03 13:33:05.000000000 +0000
-+++ gdal-1.3.2/GNUmakefile 2006-11-03 13:33:37.000000000 +0000
-@@ -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
-
-diff -Naur gdal-1.3.2-orig/alg/GNUmakefile gdal-1.3.2/alg/GNUmakefile
---- gdal-1.3.2-orig/alg/GNUmakefile 2006-11-03 13:33:04.000000000 +0000
-+++ gdal-1.3.2/alg/GNUmakefile 2006-11-03 13:33:37.000000000 +0000
-@@ -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)
-diff -Naur gdal-1.3.2-orig/apps/GNUmakefile gdal-1.3.2/apps/GNUmakefile
---- gdal-1.3.2-orig/apps/GNUmakefile 2006-11-03 13:33:22.000000000 +0000
-+++ gdal-1.3.2/apps/GNUmakefile 2006-11-03 13:33:37.000000000 +0000
-@@ -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
-
-diff -Naur gdal-1.3.2-orig/frmts/mem/GNUmakefile gdal-1.3.2/frmts/mem/GNUmakefile
---- gdal-1.3.2-orig/frmts/mem/GNUmakefile 2006-11-03 13:33:18.000000000 +0000
-+++ gdal-1.3.2/frmts/mem/GNUmakefile 2006-11-03 13:33:37.000000000 +0000
-@@ -14,4 +14,4 @@
- install-obj: $(O_OBJ)
-
- install:
-- $(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
-+ $(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
-diff -Naur gdal-1.3.2-orig/frmts/raw/GNUmakefile gdal-1.3.2/frmts/raw/GNUmakefile
---- gdal-1.3.2-orig/frmts/raw/GNUmakefile 2006-11-03 13:33:09.000000000 +0000
-+++ gdal-1.3.2/frmts/raw/GNUmakefile 2006-11-03 13:33:37.000000000 +0000
-@@ -20,4 +20,4 @@
- $(OBJ) $(O_OBJ): rawdataset.h
-
- install:
-- $(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
-+ $(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
-diff -Naur gdal-1.3.2-orig/frmts/vrt/GNUmakefile gdal-1.3.2/frmts/vrt/GNUmakefile
---- gdal-1.3.2-orig/frmts/vrt/GNUmakefile 2006-11-03 13:33:18.000000000 +0000
-+++ gdal-1.3.2/frmts/vrt/GNUmakefile 2006-11-03 13:33:37.000000000 +0000
-@@ -18,4 +18,4 @@
- $(OBJ) $(O_OBJ): vrtdataset.h
-
- install:
-- $(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
-+ $(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
-diff -Naur gdal-1.3.2-orig/gcore/GNUmakefile gdal-1.3.2/gcore/GNUmakefile
---- gdal-1.3.2-orig/gcore/GNUmakefile 2006-11-03 13:33:22.000000000 +0000
-+++ gdal-1.3.2/gcore/GNUmakefile 2006-11-03 13:33:37.000000000 +0000
-@@ -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
-diff -Naur gdal-1.3.2-orig/man/GNUmakefile gdal-1.3.2/man/GNUmakefile
---- gdal-1.3.2-orig/man/GNUmakefile 2006-11-03 13:33:22.000000000 +0000
-+++ gdal-1.3.2/man/GNUmakefile 2006-11-03 13:33:37.000000000 +0000
-@@ -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
-diff -Naur gdal-1.3.2-orig/ogr/GNUmakefile gdal-1.3.2/ogr/GNUmakefile
---- gdal-1.3.2-orig/ogr/GNUmakefile 2006-11-03 13:33:31.000000000 +0000
-+++ gdal-1.3.2/ogr/GNUmakefile 2006-11-03 13:33:37.000000000 +0000
-@@ -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
-diff -Naur gdal-1.3.2-orig/port/GNUmakefile gdal-1.3.2/port/GNUmakefile
---- gdal-1.3.2-orig/port/GNUmakefile 2006-11-03 13:33:23.000000000 +0000
-+++ gdal-1.3.2/port/GNUmakefile 2006-11-03 13:33:37.000000000 +0000
-@@ -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
-diff -Naur gdal-1.3.2-orig/pymod/GNUmakefile gdal-1.3.2/pymod/GNUmakefile
---- gdal-1.3.2-orig/pymod/GNUmakefile 2006-11-03 13:33:22.000000000 +0000
-+++ gdal-1.3.2/pymod/GNUmakefile 2006-11-03 13:33:37.000000000 +0000
-@@ -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
diff --git a/extra/gdal/gdal-gcc4.patch b/extra/gdal/gdal-gcc4.patch
deleted file mode 100644
index d6718d7f3..000000000
--- a/extra/gdal/gdal-gcc4.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** gdal-1.3.1/frmts/fit/fitdataset.cpp.old Thu Nov 24 12:14:08 2005
---- gdal-1.3.1/frmts/fit/fitdataset.cpp Thu Nov 24 12:14:19 2005
-***************
-*** 174,180 ****
-
- public:
-
-! FITRasterBand::FITRasterBand( FITDataset *, int );
- ~FITRasterBand();
-
- // should override RasterIO eventually.
---- 174,180 ----
-
- public:
-
-! FITRasterBand( FITDataset *, int );
- ~FITRasterBand();
-
- // should override RasterIO eventually.