Have "make install" only install what "make" built (#1652)

Also updates the README to be in sync with Makefile.in

git-svn-id: http://svn.osgeo.org/postgis/trunk@9405 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/doc/Makefile.in b/doc/Makefile.in
index fac4f09237f28a316b6b5fb8b0ef548920337026..15c187dcb0ea9ee9adf787cf8fbb3f8aa251c51f 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -235,9 +235,9 @@ docs-uninstall:
        rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
        rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
 
-install: docs-install man-install comments-install
+install: comments-install
 
-uninstall: docs-uninstall man-uninstall comments-uninstall
+uninstall: comments-uninstall
 
 ifeq ($(XSLTPROC),)
 garden: requirements_not_met_xsltproc

diff --git a/doc/README b/doc/README
index c56efcf9fc5d573d25880af5af9b8cb83c609ef2..6053d3a02160053a034101b252861b9c746cb696 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -8,25 +8,22 @@ can convert to chunked html, single-file html and pdf.
 
 Make targets are:
 
-  make                      # defaults to creating  
-                            #   - the images used in the generated documentation
-                            #   - the documentation as a single html file
-                            #   - a sql script used to apply COMMENTS for every PostGIS function
+  make                      # same as "make comments"
+  make install              # same as "make comments-install"
+  make uninstall            # same as "make comments-uninstall"
   
-  make html/postgis.html    # generates a single-file html file called html/postgis.html
+  make html                 # generates a single-file html file called html/postgis.html
   make chunked-html         # generates a separate html file for every chapter or section break
   make pdf                  # generates a single pdf file with the PostGIS version as a filename
   make images               # generates all the images used in the html and pdf targets
   make comments             # generates a sql script that add COMMENTs for every function (derived from the documentation)
   make doxygen              # generates the developer's documentation using Doxygen
-  
-  make install              # copies PostGIS' utility (ie. shp2pgsql) man pages to the PostgreSQL's doc directory
-  make uninstall            # removes PostGIS' utility man pages
+
   make comments-install     # copies the postgis-comments.sql script to the PostgreSQL's contrib directory
   make comments-uninstall   # removes the postgis-comments.sql script from the contrib directory
   
-  make clean                # removes any generated files (except images and html files)
-  make maintainer-clean     # clears out the generated images and html files
+  make clean                # removes generated files except comments
+  make maintainer-clean     # removes all generated files (including comments)
 
 
 ====================================================