---- gdal-1.1.7/GNUmakefile.orig Wed Mar 27 22:41:45 2002
-+++ gdal-1.1.7/GNUmakefile Mon Jun 17 22:45:44 2002
-@@ -114,10 +114,10 @@
- install: lib install-actions
+--- 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-actions:
+ 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_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 core; $(MAKE) install)
+ (cd gcore; $(MAKE) install)
(cd frmts; $(MAKE) install)
-@@ -126,8 +126,8 @@
- ifneq ($(PYTHON),no)
- (cd pymod; $(MAKE) install)
- endif
-- $(INSTALL) $(GDAL_LIB) $(INST_LIB)
-+ $(INSTALL) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
- ifeq ($(HAVE_LD_SHARED),yes)
-- $(INSTALL) $(GDAL_SLIB) $(INST_LIB)
-+ $(INSTALL) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)
+@@ -166,14 +166,14 @@
+ ifneq ($(BINDINGS),)
+ (cd swig; $(MAKE) install)
endif
-- for f in data/*.csv data/stateplane.txt ; do $(INSTALL) $$f $(INST_DATA) ; done
-+ for f in data/*.csv data/stateplane.txt ; do $(INSTALL) $$f $(DESTDIR)$(INST_DATA) ; done
---- gdal-1.1.7/ogr/GNUmakefile.orig Fri Mar 29 00:54:26 2002
-+++ gdal-1.1.7/ogr/GNUmakefile Mon Jun 17 22:46:38 2002
-@@ -123,16 +123,16 @@
+- 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: ogrinfo ogr2ogr ogrtindex
+ install-full: apps
- $(INSTALL) ogr2ogr $(INST_BIN)
- $(INSTALL) ogrinfo $(INST_BIN)
- $(INSTALL) ogrtindex $(INST_BIN)
-- $(INSTALL) $(OGRFRMTS_LIB) $(INST_LIB)
+ $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
+ $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
+ $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
-+ $(INSTALL) $(OGRFRMTS_LIB) $(DESTDIR)$(INST_LIB)
else
install-full:
endif
- install: $(OGR_LIB) install-full
-- for f in $(INST_H_FILES) ; do $(INSTALL) $$f $(INST_INCLUDE) ; done
-- $(INSTALL) $(OGR_LIB) $(INST_LIB)
-+ for f in $(INST_H_FILES) ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done
-+ $(INSTALL) $(OGR_LIB) $(DESTDIR)$(INST_LIB)
+ 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)
---- gdal-1.1.7/pymod/GNUmakefile.orig Sat Sep 15 04:51:29 2001
-+++ gdal-1.1.7/pymod/GNUmakefile Mon Jun 17 22:48:07 2002
-@@ -30,5 +30,5 @@
+ 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:
-- $(INSTALL_DIR) $(INST_PYMOD)
-- for f in *.py $(GDALMODULE) ; do $(INSTALL) $$f $(INST_PYMOD) ; done
-+ $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
-+ for f in *.py $(GDALMODULE) ; do $(INSTALL) $$f $(DESTDIR)$(INST_PYMOD) ; done
---- gdal-1.1.7/port/GNUmakefile.orig Wed Jan 23 21:45:16 2002
-+++ gdal-1.1.7/port/GNUmakefile Mon Jun 17 22:48:41 2002
-@@ -33,8 +33,8 @@
- $(RANLIB) $(LIB)
-
- install: $(LIB)
-- for f in *.h ; do $(INSTALL) $$f $(INST_INCLUDE) ; done
-- $(INSTALL) cpl.a $(INST_LIB)
-+ for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done
-+ $(INSTALL) cpl.a $(DESTDIR)$(INST_LIB)
-
- xmlreformat: xmlreformat.o $(LIB)
-- $(CXX) $(CXXFLAGS) xmlreformat.o $(LIB) -o xmlreformat
-\ No newline at end of file
-+ $(CXX) $(CXXFLAGS) xmlreformat.o $(LIB) -o xmlreformat
---- gdal-1.1.7/alg/GNUmakefile.orig Thu Mar 15 04:17:34 2001
-+++ gdal-1.1.7/alg/GNUmakefile Mon Jun 17 22:49:24 2002
-@@ -19,4 +19,4 @@
- $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o
+- for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
++ for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
- install:
-- for f in *.h ; do $(INSTALL) $$f $(INST_INCLUDE) ; done
-+ for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done
---- 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 @@
+ 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 $(DESTDIR)$(INST_BIN) ; done
+ $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
---- gdal-1.1.7/core/GNUmakefile.orig Wed Nov 21 04:16:47 2001
-+++ gdal-1.1.7/core/GNUmakefile Mon Jun 17 22:50:30 2002
-@@ -26,4 +26,4 @@
- $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o
+--- 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) $$f $(INST_INCLUDE) ; done
-+ for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done
+- 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 $@
projects / packages / gdal.git / blobdiff