1 --- gdal-1.1.9/GNUmakefile.orig Wed Mar 27 22:41:45 2002
2 +++ gdal-1.1.9/GNUmakefile Mon Jun 17 22:45:44 2002
4 install: lib 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)
16 (cd gcore; $(MAKE) install)
17 (cd frmts; $(MAKE) install)
20 (cd pymod; $(MAKE) install)
22 - $(INSTALL_DATA) $(GDAL_LIB) $(INST_LIB)
23 + $(INSTALL_DATA) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
24 ifeq ($(HAVE_LD_SHARED),yes)
25 - $(INSTALL_DATA) $(GDAL_SLIB) $(INST_LIB)
26 + $(INSTALL) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)
28 - for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
29 + for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
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
35 ifeq ($(OGR_ENABLED),yes)
37 - $(INSTALL) ogr2ogr $(INST_BIN)
38 - $(INSTALL) ogrinfo $(INST_BIN)
39 - $(INSTALL) ogrtindex $(INST_BIN)
40 - $(INSTALL_DATA) $(OGRFRMTS_LIB) $(INST_LIB)
41 + $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
42 + $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
43 + $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
44 + $(INSTALL_DATA) $(OGRFRMTS_LIB) $(DESTDIR)$(INST_LIB)
49 install: $(OGR_LIB) install-full
50 for f in $(INST_H_FILES) ; \
51 - do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
52 + do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
54 - $(INSTALL_DATA) $(OGR_LIB) $(INST_LIB)
55 + $(INSTALL_DATA) $(OGR_LIB) $(DESTDIR)$(INST_LIB)
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
62 # special care is taken so that python scripts are installed as executables
63 install: $(GDALMODULE)
64 - $(INSTALL_DIR) $(INST_PYMOD)
65 - $(INSTALL_DATA) $(GDALMODULE) $(INST_PYMOD)
66 + $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
67 + $(INSTALL_DATA) $(GDALMODULE) $(DESTDIR)$(INST_PYMOD)
69 if egrep '\#\!.*python' $$f > /dev/null ; then \
70 - $(INSTALL) $$f $(INST_PYMOD) ; \
71 + $(INSTALL) $$f $(DESTDIR)$(INST_PYMOD) ; \
73 - $(INSTALL_DATA) $$f $(INST_PYMOD) ; \
74 + $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; \
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
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)
89 xmlreformat: xmlreformat.o $(LIB)
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
94 $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o
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
101 (cd .. ; $(MAKE) force-lib)
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
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
113 --- gdal-1.1.9/gcore/GNUmakefile.orig Wed Nov 21 04:16:47 2001
114 +++ gdal-1.1.9/gcore/GNUmakefile Mon Jun 17 22:50:30 2002
116 $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o
119 - for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
120 + for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done