Opened 12 years ago

Closed 12 years ago

#1528 closed defect (fixed)

docs-install uses bare cp

Reported by: gdt Owned by: strk
Priority: low Milestone: PostGIS 2.0.0
Component: build Version: master
Keywords: Cc:

Description

It should use INSTALL_DATA. Because docs/Makefile.in doesn't use pgxs, we have to substitute it from configure. (Line numbers in 2nd hunk won't match, because I extracted hunks to avoid including other pending changes.) 

Index: doc/Makefile.in
===================================================================
--- doc/Makefile.in	(revision 9010)
+++ doc/Makefile.in	(working copy)
@@ -15,2 +15,5 @@
 
+INSTALL=@INSTALL@
+INSTALL_DATA=@INSTALL_DATA@
+
 XSLTPROC=@XSLTPROC@
@@ -162,6 +170,6 @@
 	mkdir -p $(DESTDIR)$(PGSQL_MANDIR)/man1
-	cp html/postgis.html $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
-	cp ../README.postgis $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
-	cp man/pgsql2shp.1 $(DESTDIR)$(PGSQL_MANDIR)/man1/pgsql2shp.1
-	cp man/shp2pgsql.1 $(DESTDIR)$(PGSQL_MANDIR)/man1/shp2pgsql.1
+	$(INSTALL_DATA) html/postgis.html $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
+	$(INSTALL_DATA) ../README.postgis $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
+	$(INSTALL_DATA) man/pgsql2shp.1 $(DESTDIR)$(PGSQL_MANDIR)/man1/pgsql2shp.1
+	$(INSTALL_DATA) man/shp2pgsql.1 $(DESTDIR)$(PGSQL_MANDIR)/man1/shp2pgsql.1

Change History (2)

comment:1 by gdt, 12 years ago

Component: postgis → build/upgrade/install
Owner: changed from pramsey to strk

comment:2 by pramsey, 12 years ago

Resolution: → fixed
Status: new → closed

Thanks, r9084

Note: See TracTickets for help on using tickets.