]>
Commit | Line | Data |
---|---|---|
6b59fa88 JB |
1 | --- gdal-1.1.8/GNUmakefile.orig Wed Mar 27 22:41:45 2002 |
2 | +++ gdal-1.1.8/GNUmakefile Mon Jun 17 22:45:44 2002 | |
faf5649c JB |
3 | @@ -114,10 +114,10 @@ |
4 | install: lib install-actions | |
5 | ||
6 | 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) | |
6b59fa88 | 18 | @@ -126,9 +126,9 @@ |
faf5649c JB |
19 | ifneq ($(PYTHON),no) |
20 | (cd pymod; $(MAKE) install) | |
21 | endif | |
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) | |
27 | endif | |
6b59fa88 JB |
28 | - for f in data/*.* ; do $(INSTALL) -m 0644 $$f $(INST_DATA) ; done |
29 | + for f in data/*.* ; do $(INSTALL) -m 0644 $$f $(DESTDIR)$(INST_DATA) ; done | |
30 | ||
faf5649c JB |
31 | --- gdal-1.1.7/ogr/GNUmakefile.orig Fri Mar 29 00:54:26 2002 |
32 | +++ gdal-1.1.7/ogr/GNUmakefile Mon Jun 17 22:46:38 2002 | |
33 | @@ -123,16 +123,16 @@ | |
34 | ||
35 | ifeq ($(OGR_ENABLED),yes) | |
36 | install-full: ogrinfo ogr2ogr ogrtindex | |
37 | - $(INSTALL) ogr2ogr $(INST_BIN) | |
38 | - $(INSTALL) ogrinfo $(INST_BIN) | |
39 | - $(INSTALL) ogrtindex $(INST_BIN) | |
40 | - $(INSTALL) $(OGRFRMTS_LIB) $(INST_LIB) | |
41 | + $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN) | |
42 | + $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN) | |
43 | + $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN) | |
44 | + $(INSTALL) $(OGRFRMTS_LIB) $(DESTDIR)$(INST_LIB) | |
45 | else | |
46 | install-full: | |
47 | endif | |
48 | ||
49 | install: $(OGR_LIB) install-full | |
50 | - for f in $(INST_H_FILES) ; do $(INSTALL) $$f $(INST_INCLUDE) ; done | |
51 | - $(INSTALL) $(OGR_LIB) $(INST_LIB) | |
52 | + for f in $(INST_H_FILES) ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done | |
53 | + $(INSTALL) $(OGR_LIB) $(DESTDIR)$(INST_LIB) | |
54 | ||
55 | ||
56 | --- gdal-1.1.7/pymod/GNUmakefile.orig Sat Sep 15 04:51:29 2001 | |
57 | +++ gdal-1.1.7/pymod/GNUmakefile Mon Jun 17 22:48:07 2002 | |
58 | @@ -30,5 +30,5 @@ | |
59 | ||
60 | ||
61 | install: | |
62 | - $(INSTALL_DIR) $(INST_PYMOD) | |
63 | - for f in *.py $(GDALMODULE) ; do $(INSTALL) $$f $(INST_PYMOD) ; done | |
64 | + $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD) | |
65 | + for f in *.py $(GDALMODULE) ; do $(INSTALL) $$f $(DESTDIR)$(INST_PYMOD) ; done | |
66 | --- gdal-1.1.7/port/GNUmakefile.orig Wed Jan 23 21:45:16 2002 | |
67 | +++ gdal-1.1.7/port/GNUmakefile Mon Jun 17 22:48:41 2002 | |
68 | @@ -33,8 +33,8 @@ | |
69 | $(RANLIB) $(LIB) | |
70 | ||
71 | install: $(LIB) | |
72 | - for f in *.h ; do $(INSTALL) $$f $(INST_INCLUDE) ; done | |
73 | - $(INSTALL) cpl.a $(INST_LIB) | |
74 | + for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done | |
75 | + $(INSTALL) cpl.a $(DESTDIR)$(INST_LIB) | |
76 | ||
77 | xmlreformat: xmlreformat.o $(LIB) | |
78 | - $(CXX) $(CXXFLAGS) xmlreformat.o $(LIB) -o xmlreformat | |
79 | \ No newline at end of file | |
80 | + $(CXX) $(CXXFLAGS) xmlreformat.o $(LIB) -o xmlreformat | |
81 | --- gdal-1.1.7/alg/GNUmakefile.orig Thu Mar 15 04:17:34 2001 | |
82 | +++ gdal-1.1.7/alg/GNUmakefile Mon Jun 17 22:49:24 2002 | |
83 | @@ -19,4 +19,4 @@ | |
84 | $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o | |
85 | ||
86 | install: | |
87 | - for f in *.h ; do $(INSTALL) $$f $(INST_INCLUDE) ; done | |
88 | + for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done | |
89 | --- gdal-1.1.7/apps/GNUmakefile.orig Wed Nov 7 04:49:16 2001 | |
90 | +++ gdal-1.1.7/apps/GNUmakefile Mon Jun 17 22:50:06 2002 | |
91 | @@ -86,6 +86,6 @@ | |
92 | ||
93 | ||
94 | install: default | |
95 | - for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done | |
96 | - $(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config | |
97 | + for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done | |
98 | + $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config | |
99 | ||
100 | --- gdal-1.1.7/core/GNUmakefile.orig Wed Nov 21 04:16:47 2001 | |
101 | +++ gdal-1.1.7/core/GNUmakefile Mon Jun 17 22:50:30 2002 | |
102 | @@ -26,4 +26,4 @@ | |
103 | $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o | |
104 | ||
105 | install: | |
106 | - for f in *.h ; do $(INSTALL) $$f $(INST_INCLUDE) ; done | |
107 | + for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done |