1 --- gdal-1.2.0/GNUmakefile.orig 2004-02-24 15:55:47.000000000 +0100
2 +++ gdal-1.2.0/GNUmakefile 2004-04-07 21:58:20.463813504 +0200
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
13 cp html/*.* $(WEB_DIR)
15 install: default install-actions
17 install-actions: install-lib
18 - $(INSTALL_DIR) $(INST_BIN)
19 - $(INSTALL_DIR) $(INST_DATA)
20 - $(INSTALL_DIR) $(INST_INCLUDE)
21 + $(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
22 + $(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
23 + $(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
24 (cd port; $(MAKE) install)
25 (cd gcore; $(MAKE) install)
26 (cd frmts; $(MAKE) install)
29 (cd pymod; $(MAKE) install)
31 - for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
32 - $(LIBTOOL_FINISH) $(INST_LIB)
33 + for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
34 + $(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
36 ifeq ($(HAVE_LIBTOOL),yes)
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
47 GDAL_SLIB_B = $(notdir $(GDAL_SLIB))
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)
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))
64 + (cd $(DESTDIR)$(INST_LIB) ; \
65 ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VER_MAJOR))
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)
75 endif # HAVE_LD_SHARED=no
77 --- gdal-1.2.0/ogr/GNUmakefile.orig 2004-02-21 16:36:44.000000000 +0100
78 +++ gdal-1.2.0/ogr/GNUmakefile 2004-04-07 21:59:04.108178552 +0200
80 cp ogrsf_frmts/ogr_formats.html html
83 - $(INSTALL_DIR) $(INST_DOCS)/ogr
84 - cp html/* $(INST_DOCS)/ogr
85 + $(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
86 + cp html/* $(DESTDIR)$(INST_DOCS)/ogr
92 ifeq ($(OGR_ENABLED),yes)
94 - $(INSTALL) ogr2ogr $(INST_BIN)
95 - $(INSTALL) ogrinfo $(INST_BIN)
96 - $(INSTALL) ogrtindex $(INST_BIN)
97 + $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
98 + $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
99 + $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
104 install: install-full
105 for f in $(INST_H_FILES) ; \
106 - do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
107 + do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
109 --- gdal-1.2.6/pymod/GNUmakefile.orig 2005-01-31 23:07:02.000000000 +0100
110 +++ gdal-1.2.6/pymod/GNUmakefile 2005-03-28 23:55:02.370967240 +0200
113 # special care is taken so that python scripts are installed as executables
114 install: $(GDALMODULE_SO)
115 - $(INSTALL_DIR) $(INST_PYMOD)
116 - $(INSTALL_LIB) $(GDALMODULE_SO) $(INST_PYMOD)
117 - for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(INST_BIN) ; done
118 - for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(INST_PYMOD) ; done
119 + $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
120 + $(INSTALL_LIB) $(GDALMODULE_SO) $(DESTDIR)$(INST_PYMOD)
121 + for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
122 + for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; done
123 # ugh! spurius relinking leaves a file owned by root into .libs/.
125 --- gdal-1.2.0/port/GNUmakefile.orig 2003-12-28 18:25:00.000000000 +0100
126 +++ gdal-1.2.0/port/GNUmakefile 2004-04-07 22:00:08.007464384 +0200
131 - for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
132 + for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
134 xmlreformat: xmlreformat.o
135 $(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat
136 --- gdal-1.2.0/alg/GNUmakefile.orig 2003-12-16 12:13:25.000000000 +0100
137 +++ gdal-1.2.0/alg/GNUmakefile 2004-04-07 21:55:34.476047480 +0200
139 (cd ..; $(MAKE) docs)
142 - for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
143 + for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
146 (cd .. ; $(MAKE) force-lib)
147 --- gdal-1.2.0/apps/GNUmakefile.orig 2004-02-21 15:31:38.000000000 +0100
148 +++ gdal-1.2.0/apps/GNUmakefile 2004-04-07 21:55:34.478047176 +0200
153 - for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done
154 - $(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config
155 + for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
156 + $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
158 --- gdal-1.2.0/gcore/GNUmakefile.orig 2003-12-16 12:13:46.000000000 +0100
159 +++ gdal-1.2.0/gcore/GNUmakefile 2004-04-07 21:55:34.479047024 +0200
164 - for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
165 + for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
166 --- gdal-1.2.0/man/GNUmakefile.orig 2004-02-20 18:26:13.000000000 +0100
167 +++ gdal-1.2.0/man/GNUmakefile 2004-04-07 22:01:23.370007536 +0200
169 include ../GDALmake.opt
172 - $(INSTALL_DIR) $(INST_MAN)/man1
173 - for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(INST_MAN)/man1 ; done
174 + $(INSTALL_DIR) $(DESTDIR)$(INST_MAN)/man1
175 + for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_MAN)/man1 ; done
176 --- gdal-1.2.6/frmts/vrt/GNUmakefile.orig 2005-01-24 19:09:57.000000000 +0100
177 +++ gdal-1.2.6/frmts/vrt/GNUmakefile 2005-03-29 00:56:45.822956960 +0200
179 $(OBJ) $(O_OBJ): vrtdataset.h
182 - $(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
183 + $(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
184 --- gdal-1.2.6/frmts/mem/GNUmakefile.orig 2005-01-24 19:09:57.000000000 +0100
185 +++ gdal-1.2.6/frmts/mem/GNUmakefile 2005-03-29 01:59:50.803552448 +0200
187 install-obj: $(O_OBJ)
190 - $(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
191 + $(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
192 --- gdal-1.2.6/frmts/raw/GNUmakefile.orig 2005-01-24 19:09:57.000000000 +0100
193 +++ gdal-1.2.6/frmts/raw/GNUmakefile 2005-03-29 09:59:16.200547408 +0200
195 $(OBJ) $(O_OBJ): rawdataset.h
198 - $(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
199 + $(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)