1 --- gdal-1.1.7/GNUmakefile.orig Wed Mar 27 22:41:45 2002
2 +++ gdal-1.1.7/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 core; $(MAKE) install)
17 (cd frmts; $(MAKE) install)
20 (cd pymod; $(MAKE) install)
22 - $(INSTALL) $(GDAL_LIB) $(INST_LIB)
23 + $(INSTALL) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
24 ifeq ($(HAVE_LD_SHARED),yes)
25 - $(INSTALL) $(GDAL_SLIB) $(INST_LIB)
26 + $(INSTALL) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)
28 - for f in data/*.csv data/stateplane.txt ; do $(INSTALL) $$f $(INST_DATA) ; done
29 + for f in data/*.csv data/stateplane.txt ; do $(INSTALL) $$f $(DESTDIR)$(INST_DATA) ; done
30 --- gdal-1.1.7/ogr/GNUmakefile.orig Fri Mar 29 00:54:26 2002
31 +++ gdal-1.1.7/ogr/GNUmakefile Mon Jun 17 22:46:38 2002
34 ifeq ($(OGR_ENABLED),yes)
35 install-full: ogrinfo ogr2ogr ogrtindex
36 - $(INSTALL) ogr2ogr $(INST_BIN)
37 - $(INSTALL) ogrinfo $(INST_BIN)
38 - $(INSTALL) ogrtindex $(INST_BIN)
39 - $(INSTALL) $(OGRFRMTS_LIB) $(INST_LIB)
40 + $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
41 + $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
42 + $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
43 + $(INSTALL) $(OGRFRMTS_LIB) $(DESTDIR)$(INST_LIB)
48 install: $(OGR_LIB) install-full
49 - for f in $(INST_H_FILES) ; do $(INSTALL) $$f $(INST_INCLUDE) ; done
50 - $(INSTALL) $(OGR_LIB) $(INST_LIB)
51 + for f in $(INST_H_FILES) ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done
52 + $(INSTALL) $(OGR_LIB) $(DESTDIR)$(INST_LIB)
55 --- gdal-1.1.7/pymod/GNUmakefile.orig Sat Sep 15 04:51:29 2001
56 +++ gdal-1.1.7/pymod/GNUmakefile Mon Jun 17 22:48:07 2002
61 - $(INSTALL_DIR) $(INST_PYMOD)
62 - for f in *.py $(GDALMODULE) ; do $(INSTALL) $$f $(INST_PYMOD) ; done
63 + $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
64 + for f in *.py $(GDALMODULE) ; do $(INSTALL) $$f $(DESTDIR)$(INST_PYMOD) ; done
65 --- gdal-1.1.7/port/GNUmakefile.orig Wed Jan 23 21:45:16 2002
66 +++ gdal-1.1.7/port/GNUmakefile Mon Jun 17 22:48:41 2002
71 - for f in *.h ; do $(INSTALL) $$f $(INST_INCLUDE) ; done
72 - $(INSTALL) cpl.a $(INST_LIB)
73 + for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done
74 + $(INSTALL) cpl.a $(DESTDIR)$(INST_LIB)
76 xmlreformat: xmlreformat.o $(LIB)
77 - $(CXX) $(CXXFLAGS) xmlreformat.o $(LIB) -o xmlreformat
78 \ No newline at end of file
79 + $(CXX) $(CXXFLAGS) xmlreformat.o $(LIB) -o xmlreformat
80 --- gdal-1.1.7/alg/GNUmakefile.orig Thu Mar 15 04:17:34 2001
81 +++ gdal-1.1.7/alg/GNUmakefile Mon Jun 17 22:49:24 2002
83 $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o
86 - for f in *.h ; do $(INSTALL) $$f $(INST_INCLUDE) ; done
87 + for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done
88 --- gdal-1.1.7/apps/GNUmakefile.orig Wed Nov 7 04:49:16 2001
89 +++ gdal-1.1.7/apps/GNUmakefile Mon Jun 17 22:50:06 2002
94 - for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done
95 - $(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config
96 + for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
97 + $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
99 --- gdal-1.1.7/core/GNUmakefile.orig Wed Nov 21 04:16:47 2001
100 +++ gdal-1.1.7/core/GNUmakefile Mon Jun 17 22:50:30 2002
102 $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o
105 - for f in *.h ; do $(INSTALL) $$f $(INST_INCLUDE) ; done
106 + for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done