]>
Commit | Line | Data |
---|---|---|
dadc3fa6 JB |
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 | |
3 | @@ -123,8 +123,8 @@ | |
4 | ||
5 | install-docs: | |
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 | |
11 | ||
12 | web-update: docs | |
13 | cp html/*.* $(WEB_DIR) | |
14 | @@ -132,9 +132,9 @@ | |
15 | install: default install-actions | |
16 | ||
17 | install-actions: install-lib | |
faf5649c JB |
18 | - $(INSTALL_DIR) $(INST_BIN) |
19 | - $(INSTALL_DIR) $(INST_DATA) | |
faf5649c JB |
20 | - $(INSTALL_DIR) $(INST_INCLUDE) |
21 | + $(INSTALL_DIR) $(DESTDIR)$(INST_BIN) | |
22 | + $(INSTALL_DIR) $(DESTDIR)$(INST_DATA) | |
faf5649c JB |
23 | + $(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE) |
24 | (cd port; $(MAKE) install) | |
3a591acf | 25 | (cd gcore; $(MAKE) install) |
faf5649c | 26 | (cd frmts; $(MAKE) install) |
dadc3fa6 | 27 | @@ -145,14 +145,14 @@ |
faf5649c JB |
28 | ifneq ($(PYTHON),no) |
29 | (cd pymod; $(MAKE) install) | |
30 | endif | |
3a591acf | 31 | - for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done |
dadc3fa6 | 32 | - $(LIBTOOL_FINISH) $(INST_LIB) |
3a591acf | 33 | + for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done |
dadc3fa6 JB |
34 | + $(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB) |
35 | ||
36 | ifeq ($(HAVE_LIBTOOL),yes) | |
37 | ||
38 | install-lib: | |
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 | |
43 | ||
44 | else | |
45 | ||
46 | @@ -162,21 +162,21 @@ | |
47 | GDAL_SLIB_B = $(notdir $(GDAL_SLIB)) | |
48 | ||
49 | install-lib: | |
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) | |
55 | - (cd $(INST_LIB) ; \ | |
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)) | |
63 | - (cd $(INST_LIB) ; \ | |
64 | + (cd $(DESTDIR)$(INST_LIB) ; \ | |
65 | ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VER_MAJOR)) | |
66 | ||
67 | else | |
68 | ||
69 | install-lib: | |
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) | |
74 | ||
75 | endif # HAVE_LD_SHARED=no | |
76 | ||
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 | |
79 | @@ -74,8 +74,8 @@ | |
80 | cp ogrsf_frmts/ogr_formats.html html | |
81 | ||
82 | install-docs: | |
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 | |
87 | ||
88 | gdalso: $(GDAL_SLIB) | |
6b59fa88 | 89 | |
dadc3fa6 | 90 | @@ -115,14 +115,14 @@ |
faf5649c JB |
91 | |
92 | ifeq ($(OGR_ENABLED),yes) | |
3a591acf | 93 | install-full: apps |
faf5649c JB |
94 | - $(INSTALL) ogr2ogr $(INST_BIN) |
95 | - $(INSTALL) ogrinfo $(INST_BIN) | |
96 | - $(INSTALL) ogrtindex $(INST_BIN) | |
faf5649c JB |
97 | + $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN) |
98 | + $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN) | |
99 | + $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN) | |
faf5649c JB |
100 | else |
101 | install-full: | |
102 | endif | |
103 | ||
dadc3fa6 | 104 | install: install-full |
3a591acf JB |
105 | for f in $(INST_H_FILES) ; \ |
106 | - do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \ | |
107 | + do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \ | |
108 | done | |
dadc3fa6 JB |
109 | --- gdal-1.2.0/pymod/GNUmakefile.orig 2004-02-25 08:48:17.000000000 +0100 |
110 | +++ gdal-1.2.0/pymod/GNUmakefile 2004-04-07 21:59:49.741241272 +0200 | |
111 | @@ -40,9 +40,9 @@ | |
faf5649c | 112 | |
3a591acf | 113 | # special care is taken so that python scripts are installed as executables |
dadc3fa6 | 114 | install: $(GDALMODULE).$(SO_EXT) |
faf5649c | 115 | - $(INSTALL_DIR) $(INST_PYMOD) |
dadc3fa6 JB |
116 | - $(INSTALL_LIB) $(GDALMODULE).$(SO_EXT) $(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 | |
faf5649c | 119 | + $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD) |
dadc3fa6 JB |
120 | + $(INSTALL_LIB) $(GDALMODULE).$(SO_EXT) $(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/. | |
124 | rm -f .libs/*.soT | |
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 | |
127 | @@ -25,7 +25,7 @@ | |
128 | $(RM) *.o $(LIB) | |
faf5649c | 129 | |
dadc3fa6 | 130 | install: |
3a591acf | 131 | - for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done |
3a591acf | 132 | + for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done |
faf5649c | 133 | |
dadc3fa6 JB |
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 | |
138 | @@ -22,7 +22,7 @@ | |
139 | (cd ..; $(MAKE) docs) | |
faf5649c JB |
140 | |
141 | install: | |
3a591acf JB |
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 | |
144 | ||
145 | lib: $(OBJ) | |
dadc3fa6 JB |
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 | |
149 | @@ -92,6 +92,6 @@ | |
faf5649c JB |
150 | |
151 | ||
152 | install: default | |
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 | |
157 | ||
dadc3fa6 JB |
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 | |
160 | @@ -31,4 +31,4 @@ | |
161 | $*.cpp -o $*.o | |
faf5649c JB |
162 | |
163 | install: | |
3a591acf JB |
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 | |
dadc3fa6 JB |
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 | |
168 | @@ -5,5 +5,5 @@ | |
169 | include ../GDALmake.opt | |
170 | ||
171 | install: | |
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 |