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
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 swig; $(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.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
80 cp ogr_feature_style.html html
83 - $(INSTALL_DIR) $(INST_DOCS)/ogr
84 - cp html/* $(INST_DOCS)/ogr
85 - cp ../doc/ogr/*.gif $(INST_DOCS)/ogr
86 + $(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
87 + cp html/* $(DESTDIR)$(INST_DOCS)/ogr
88 + cp ../doc/ogr/*.gif $(DESTDIR)$(INST_DOCS)/ogr
94 ifeq ($(OGR_ENABLED),yes)
96 - $(INSTALL) ogr2ogr $(INST_BIN)
97 - $(INSTALL) ogrinfo $(INST_BIN)
98 - $(INSTALL) ogrtindex $(INST_BIN)
99 + $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
100 + $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
101 + $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
106 install: install-full
107 for f in $(INST_H_FILES) ; \
108 - do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
109 + do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
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
115 # special care is taken so that python scripts are installed as executables
116 install: $(GDALMODULE_SO)
117 - $(INSTALL_DIR) $(INST_PYMOD)
118 - $(INSTALL_LIB) $(GDALMODULE_SO) $(INST_PYMOD)
119 - for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(INST_BIN) ; done
120 - for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(INST_PYMOD) ; done
121 + $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
122 + $(INSTALL_LIB) $(GDALMODULE_SO) $(DESTDIR)$(INST_PYMOD)
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/.
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
133 - for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
134 + for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
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
141 (cd ..; $(MAKE) docs)
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
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
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
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
166 - for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
167 + for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
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
171 include ../GDALmake.opt
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
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
181 $(OBJ) $(O_OBJ): vrtdataset.h
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
189 install-obj: $(O_OBJ)
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
197 $(OBJ) $(O_OBJ): rawdataset.h
200 - $(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
201 + $(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
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
205 python setup.py build
208 - python setup.py install --prefix=$(prefix)
209 + python setup.py install --prefix=$(DESTDIR)$(prefix)
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
214 rm -frd $(INSTALL_DIR)
217 - mkdir -v $(INSTALL_DIR)
218 +$(DESTDIR)$(INSTALL_DIR):
219 + mkdir -v $(DESTDIR)$(INSTALL_DIR)
221 -install: $(INSTALL_DIR)
222 - $(INSTALL) $(RUBY_MODULES) $(INSTALL_DIR)
223 +install: $(DESTDIR)$(INSTALL_DIR)
224 + $(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR)
226 $(RUBY_MODULES): %.so: %_wrap.o
227 $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@