Attachment #69709 for bug #105760





install-docs:
	(cd ogr; $(MAKE) install-docs)
	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/gdal
	cp html/*.* $(INST_DOCS)/gdal

web-update:	docs

install:	default install-actions

install-actions: install-lib
	$(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
	$(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
	$(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
	(cd port; $(MAKE) install)
	(cd gcore; $(MAKE) install)
	(cd frmts; $(MAKE) install)

ifneq ($(PYTHON),no)
	(cd pymod; $(MAKE) install)
endif
	for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
	$(LIBTOOL_FINISH) $(INST_LIB)

ifeq ($(HAVE_LIBTOOL),yes)

install-lib:
	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
	for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(DESTDIR)$(INST_LIB) ; done

else


GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))

install-lib:
	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
	rm -f $(INST_LIB)/$(GDAL_SLIB_B)
	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)
	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
	(cd $(INST_LIB) ; \
	 ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))
	(cd $(INST_LIB) ; \

else

install-lib:
	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
	$(INSTALL_LIB) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)

endif # HAVE_LD_SHARED=no 


Lines 23-29 Link Here

(-)gdal-1.3.0.orig/alg/GNUmakefile (-1 / +1 lines)
23	(cd ..; $(MAKE) docs)	23	(cd ..; $(MAKE) docs)
24		24
25	install:	25	install:
26	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done	26	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
27		27
28	lib: $(OBJ)	28	lib: $(OBJ)
29	(cd .. ; $(MAKE) force-lib)	29	(cd .. ; $(MAKE) force-lib)

Lines 89-94 Link Here

(-)gdal-1.3.0.orig/apps/GNUmakefile (-2 / +2 lines)
89		89
90		90
91	install: default	91	install: default
92	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done	92	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
93	$(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config	93	$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
94		94

Lines 15-18 Link Here

(-)gdal-1.3.0.orig/frmts/mem/GNUmakefile (-1 / +1 lines)
15	install-obj: $(O_OBJ)	15	install-obj: $(O_OBJ)
16		16
17	install:	17	install:
18	$(INSTALL_DATA) memdataset.h $(INST_INCLUDE)	18	$(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)

Lines 21-24 Link Here

(-)gdal-1.3.0.orig/frmts/raw/GNUmakefile (-1 / +1 lines)
21	$(OBJ) $(O_OBJ): rawdataset.h	21	$(OBJ) $(O_OBJ): rawdataset.h
22		22
23	install:	23	install:
24	$(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)	24	$(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)

Lines 19-22 Link Here

(-)gdal-1.3.0.orig/frmts/vrt/GNUmakefile (-1 / +1 lines)
19	$(OBJ) $(O_OBJ): vrtdataset.h	19	$(OBJ) $(O_OBJ): vrtdataset.h
20		20
21	install:	21	install:
22	$(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)	22	$(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)

Lines 32-35 Link Here

(-)gdal-1.3.0.orig/gcore/GNUmakefile (-1 / +1 lines)
32	$.cpp -o $.o	32	$.cpp -o $.o
33		33
34	install:	34	install:
35	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done	35	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done

Lines 5-9 Link Here

(-)gdal-1.3.0.orig/man/GNUmakefile (-2 / +2 lines)
5	include ../GDALmake.opt	5	include ../GDALmake.opt
6		6
7	install:	7	install:
8	$(INSTALL_DIR) $(INST_MAN)/man1	8	$(INSTALL_DIR) $(DESTDIR)$(INST_MAN)/man1
9	for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(INST_MAN)/man1 ; done	9	for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_MAN)/man1 ; done




	cp ogr_feature_style.html html

install-docs:
	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
	cp html/* $(INST_DOCS)/ogr

gdalso:	$(GDAL_SLIB)


ifeq ($(OGR_ENABLED),yes)
install-full:	apps
	$(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
	$(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
	$(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
else
install-full:
endif

install:	install-full
	for f in $(INST_H_FILES) ; \
	    do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
	done

Lines 25-31 Link Here

(-)gdal-1.3.0.orig/port/GNUmakefile (-1 / +1 lines)
25	$(RM) *.o $(LIB)	25	$(RM) *.o $(LIB)
26		26
27	install:	27	install:
28	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done	28	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
29		29
30	xmlreformat: xmlreformat.o	30	xmlreformat: xmlreformat.o
31	$(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat	31	$(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat

Lines 45-53 Link Here

(-)gdal-1.3.0.orig/pymod/GNUmakefile (-4 / +4 lines)
45		45
46	# special care is taken so that python scripts are installed as executables	46	# special care is taken so that python scripts are installed as executables
47	install: $(GDALMODULE_SO)	47	install: $(GDALMODULE_SO)
48	$(INSTALL_DIR) $(INST_PYMOD)	48	$(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
49	$(INSTALL_LIB) $(GDALMODULE_SO) $(INST_PYMOD)	49	$(INSTALL_LIB) $(GDALMODULE_SO) $(DESTDIR)$(INST_PYMOD)
50	for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(INST_BIN) ; done	50	for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
51	for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(INST_PYMOD) ; done	51	for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; done
52	# ugh! spurius relinking leaves a file owned by root into .libs/.	52	# ugh! spurius relinking leaves a file owned by root into .libs/.
53	rm -f .libs/*.soT	53	rm -f .libs/*.soT

Lines 50-56 Link Here

(-)gdal-1.3.0/GDALmake.opt.in.orig (-1 / +1 lines)
50	exec_prefix = @exec_prefix@	50	exec_prefix = @exec_prefix@
51	INST_PREFIX = @exec_prefix@	51	INST_PREFIX = @exec_prefix@
52	INST_INCLUDE = @includedir@	52	INST_INCLUDE = @includedir@
53	INST_DATA = @datadir@	53	INST_DATA = @datadir@/gdal
54	INST_LIB = @libdir@	54	INST_LIB = @libdir@
55	INST_BIN = @bindir@	55	INST_BIN = @bindir@
56	INST_PYMOD = @pymoddir@	56	INST_PYMOD = @pymoddir@

Return to bug 105760

Lines 126-132 Link Here

(-)gdal-1.3.0.orig/GNUmakefile (-11 / +11 lines)
126		126
127	install-docs:	127	install-docs:
128	(cd ogr; $(MAKE) install-docs)	128	(cd ogr; $(MAKE) install-docs)
129	$(INSTALL_DIR) $(INST_DOCS)/gdal	129	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/gdal
130	cp html/. $(INST_DOCS)/gdal	130	cp html/. $(INST_DOCS)/gdal
131		131
132	web-update: docs	132	web-update: docs
Lines 135-143 Link Here
135	install: default install-actions	135	install: default install-actions
136		136
137	install-actions: install-lib	137	install-actions: install-lib
138	$(INSTALL_DIR) $(INST_BIN)	138	$(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
139	$(INSTALL_DIR) $(INST_DATA)	139	$(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
140	$(INSTALL_DIR) $(INST_INCLUDE)	140	$(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
141	(cd port; $(MAKE) install)	141	(cd port; $(MAKE) install)
142	(cd gcore; $(MAKE) install)	142	(cd gcore; $(MAKE) install)
143	(cd frmts; $(MAKE) install)	143	(cd frmts; $(MAKE) install)
Lines 148-161 Link Here
148	ifneq ($(PYTHON),no)	148	ifneq ($(PYTHON),no)
149	(cd pymod; $(MAKE) install)	149	(cd pymod; $(MAKE) install)
150	endif	150	endif
151	for f in data/. ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done	151	for f in data/. ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
152	$(LIBTOOL_FINISH) $(INST_LIB)	152	$(LIBTOOL_FINISH) $(INST_LIB)
153		153
154	ifeq ($(HAVE_LIBTOOL),yes)	154	ifeq ($(HAVE_LIBTOOL),yes)
155		155
156	install-lib:	156	install-lib:
157	$(INSTALL_DIR) $(INST_LIB)	157	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
158	for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(INST_LIB) ; done	158	for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(DESTDIR)$(INST_LIB) ; done
159		159
160	else	160	else
161		161
Lines 165-175 Link Here
165	GDAL_SLIB_B = $(notdir $(GDAL_SLIB))	165	GDAL_SLIB_B = $(notdir $(GDAL_SLIB))
166		166
167	install-lib:	167	install-lib:
168	$(INSTALL_DIR) $(INST_LIB)	168	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
169	rm -f $(INST_LIB)/$(GDAL_SLIB_B)	169	rm -f $(INST_LIB)/$(GDAL_SLIB_B)
170	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)	170	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)
171	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)	171	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
172	$(INSTALL_LIB) $(GDAL_SLIB) $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)	172	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
173	(cd $(INST_LIB) ; \	173	(cd $(INST_LIB) ; \
174	ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))	174	ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))
175	(cd $(INST_LIB) ; \	175	(cd $(INST_LIB) ; \
Lines 178-185 Link Here
178	else	178	else
179		179
180	install-lib:	180	install-lib:
181	$(INSTALL_DIR) $(INST_LIB)	181	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
182	$(INSTALL_LIB) $(GDAL_LIB) $(INST_LIB)	182	$(INSTALL_LIB) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
183		183
184	endif # HAVE_LD_SHARED=no	184	endif # HAVE_LD_SHARED=no
185		185

Lines 79-85 Link Here

(-)gdal-1.3.0.orig/ogr/GNUmakefile (-5 / +5 lines)
79	cp ogr_feature_style.html html	79	cp ogr_feature_style.html html
80		80
81	install-docs:	81	install-docs:
82	$(INSTALL_DIR) $(INST_DOCS)/ogr	82	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
83	cp html/* $(INST_DOCS)/ogr	83	cp html/* $(INST_DOCS)/ogr
84		84
85	gdalso: $(GDAL_SLIB)	85	gdalso: $(GDAL_SLIB)
Lines 120-133 Link Here
120		120
121	ifeq ($(OGR_ENABLED),yes)	121	ifeq ($(OGR_ENABLED),yes)
122	install-full: apps	122	install-full: apps
123	$(INSTALL) ogr2ogr $(INST_BIN)	123	$(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
124	$(INSTALL) ogrinfo $(INST_BIN)	124	$(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
125	$(INSTALL) ogrtindex $(INST_BIN)	125	$(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
126	else	126	else
127	install-full:	127	install-full:
128	endif	128	endif
129		129
130	install: install-full	130	install: install-full
131	for f in $(INST_H_FILES) ; \	131	for f in $(INST_H_FILES) ; \
132	do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \	132	do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
133	done	133	done