View | Details | Raw Unified
Collapse All | Expand All

(-) gdal-1.3.0.orig/GNUmakefile (-11 / +11 lines)
 Lines 126-132    Link Here 
install-docs:
install-docs:
	(cd ogr; $(MAKE) install-docs)
	(cd ogr; $(MAKE) install-docs)
	$(INSTALL_DIR) $(INST_DOCS)/gdal
	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/gdal
	cp html/*.* $(INST_DOCS)/gdal
	cp html/*.* $(INST_DOCS)/gdal
web-update:	docs
web-update:	docs
 Lines 135-143    Link Here 
install:	default install-actions
install:	default install-actions
install-actions: install-lib
install-actions: install-lib
	$(INSTALL_DIR) $(INST_BIN)
	$(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
	$(INSTALL_DIR) $(INST_DATA)
	$(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
	$(INSTALL_DIR) $(INST_INCLUDE)
	$(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
	(cd port; $(MAKE) install)
	(cd port; $(MAKE) install)
	(cd gcore; $(MAKE) install)
	(cd gcore; $(MAKE) install)
	(cd frmts; $(MAKE) install)
	(cd frmts; $(MAKE) install)
 Lines 148-161    Link Here 
ifneq ($(PYTHON),no)
ifneq ($(PYTHON),no)
	(cd pymod; $(MAKE) install)
	(cd pymod; $(MAKE) install)
endif
endif
	for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
	for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
	$(LIBTOOL_FINISH) $(INST_LIB)
	$(LIBTOOL_FINISH) $(INST_LIB)
ifeq ($(HAVE_LIBTOOL),yes)
ifeq ($(HAVE_LIBTOOL),yes)
install-lib:
install-lib:
	$(INSTALL_DIR) $(INST_LIB)
	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
	for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(INST_LIB) ; done
	for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(DESTDIR)$(INST_LIB) ; done
else
else
 Lines 165-175    Link Here 
GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))
GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))
install-lib:
install-lib:
	$(INSTALL_DIR) $(INST_LIB)
	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
	rm -f $(INST_LIB)/$(GDAL_SLIB_B)
	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_MAJOR)
	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
	$(INSTALL_LIB) $(GDAL_SLIB) $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
	(cd $(INST_LIB) ; \
	(cd $(INST_LIB) ; \
	 ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))
	 ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))
	(cd $(INST_LIB) ; \
	(cd $(INST_LIB) ; \
 Lines 178-185    Link Here 
else
else
install-lib:
install-lib:
	$(INSTALL_DIR) $(INST_LIB)
	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
	$(INSTALL_LIB) $(GDAL_LIB) $(INST_LIB)
	$(INSTALL_LIB) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
endif # HAVE_LD_SHARED=no 
endif # HAVE_LD_SHARED=no 
(-) gdal-1.3.0.orig/alg/GNUmakefile (-1 / +1 lines)
 Lines 23-29    Link Here 
	(cd ..; $(MAKE) docs)
	(cd ..; $(MAKE) docs)
install:
install:
	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
lib:	$(OBJ)
lib:	$(OBJ)
	(cd .. ; $(MAKE) force-lib)
	(cd .. ; $(MAKE) force-lib)
(-) gdal-1.3.0.orig/apps/GNUmakefile (-2 / +2 lines)
 Lines 89-94    Link Here 
install: default
install: default
	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done
	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
	$(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config
	$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
(-) gdal-1.3.0.orig/frmts/mem/GNUmakefile (-1 / +1 lines)
 Lines 15-18    Link Here 
install-obj:	$(O_OBJ)
install-obj:	$(O_OBJ)
install:
install:
	$(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
	$(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
(-) gdal-1.3.0.orig/frmts/raw/GNUmakefile (-1 / +1 lines)
 Lines 21-24    Link Here 
$(OBJ) $(O_OBJ):	rawdataset.h
$(OBJ) $(O_OBJ):	rawdataset.h
install:
install:
	$(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
	$(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
(-) gdal-1.3.0.orig/frmts/vrt/GNUmakefile (-1 / +1 lines)
 Lines 19-22    Link Here 
$(OBJ) $(O_OBJ):	vrtdataset.h
$(OBJ) $(O_OBJ):	vrtdataset.h
install:
install:
	$(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
	$(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
(-) gdal-1.3.0.orig/gcore/GNUmakefile (-1 / +1 lines)
 Lines 32-35    Link Here 
		$*.cpp -o $*.o
		$*.cpp -o $*.o
install:
install:
	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
(-) gdal-1.3.0.orig/man/GNUmakefile (-2 / +2 lines)
 Lines 5-9    Link Here 
include ../GDALmake.opt
include ../GDALmake.opt
install:
install:
	$(INSTALL_DIR) $(INST_MAN)/man1
	$(INSTALL_DIR) $(DESTDIR)$(INST_MAN)/man1
	for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(INST_MAN)/man1 ; done
	for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_MAN)/man1 ; done
(-) gdal-1.3.0.orig/ogr/GNUmakefile (-5 / +5 lines)
 Lines 79-85    Link Here 
	cp ogr_feature_style.html html
	cp ogr_feature_style.html html
install-docs:
install-docs:
	$(INSTALL_DIR) $(INST_DOCS)/ogr
	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
	cp html/* $(INST_DOCS)/ogr
	cp html/* $(INST_DOCS)/ogr
gdalso:	$(GDAL_SLIB)
gdalso:	$(GDAL_SLIB)
 Lines 120-133    Link Here 
ifeq ($(OGR_ENABLED),yes)
ifeq ($(OGR_ENABLED),yes)
install-full:	apps
install-full:	apps
	$(INSTALL) ogr2ogr $(INST_BIN)
	$(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
	$(INSTALL) ogrinfo $(INST_BIN)
	$(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
	$(INSTALL) ogrtindex $(INST_BIN)
	$(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
else
else
install-full:
install-full:
endif
endif
install:	install-full
install:	install-full
	for f in $(INST_H_FILES) ; \
	for f in $(INST_H_FILES) ; \
	    do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
	    do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
	done
	done
(-) gdal-1.3.0.orig/port/GNUmakefile (-1 / +1 lines)
 Lines 25-31    Link Here 
	$(RM) *.o $(LIB)
	$(RM) *.o $(LIB)
install:
install:
	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
xmlreformat:	xmlreformat.o 
xmlreformat:	xmlreformat.o 
	$(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat
	$(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat
(-) gdal-1.3.0/GDALmake.opt.in.orig (-5 / +5 lines)
 Lines 45-53    Link Here 
# special care is taken so that python scripts are installed as executables
# special care is taken so that python scripts are installed as executables
install:	$(GDALMODULE_SO)
install:	$(GDALMODULE_SO)
	$(INSTALL_DIR) $(INST_PYMOD)
	$(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
	$(INSTALL_LIB) $(GDALMODULE_SO) $(INST_PYMOD)
	$(INSTALL_LIB) $(GDALMODULE_SO) $(DESTDIR)$(INST_PYMOD)
	for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(INST_BIN) ; done
	for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
	for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(INST_PYMOD) ; done
	for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; done
	# ugh! spurius relinking leaves a file owned by root into .libs/.
	# ugh! spurius relinking leaves a file owned by root into .libs/.
	rm -f .libs/*.soT
	rm -f .libs/*.soT
 Lines 50-56    Link Here 
exec_prefix	=	@exec_prefix@
exec_prefix	=	@exec_prefix@
INST_PREFIX	=	@exec_prefix@
INST_PREFIX	=	@exec_prefix@
INST_INCLUDE	=	@includedir@
INST_INCLUDE	=	@includedir@
INST_DATA 	=	@datadir@
INST_DATA 	=	@datadir@/gdal
INST_LIB	=	@libdir@
INST_LIB	=	@libdir@
INST_BIN	=	@bindir@
INST_BIN	=	@bindir@
INST_PYMOD      =       @pymoddir@
INST_PYMOD      =       @pymoddir@