Distribute comments in tarball. Stop distributing pdf or html (#626)

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

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6c0cc2f130261e63257a3485584d7b17492168ea..1106575e1fa6cd955c8ddde4ccf2a3ee62690c00 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -56,7 +56,7 @@ else
 ifeq ($(IMAGEMAGICK),)
 all: requirements_not_met_imagemagick
 else
-all: images html/postgis.html postgis_comments.sql raster_comments.sql topology_comments.sql tiger_geocoder_comments.sql
+all: comments
 endif
 endif
 endif
@@ -106,7 +106,7 @@ html/postgis.html: postgis-out.xml
 
 
 postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf: postgis-out.xml images
-       @if test x"$(DBLATEX)" = x; then \
+       if test x"$(DBLATEX)" = x; then \
           echo "Error: dblatex not found, can't build pdf"; \
           echo "       try installing dblatex and then re-run configure"; \
           false; \
@@ -134,13 +134,14 @@ doxygen: doxygen.cfg
 images: 
        make -C html/image_src images
        
-clean:
+clean: 
+       rm -f html/*.html
+       rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
        make -C html/image_src clean
-       @rm -f postgis-out.xml postgis_aggs_mm.xml
+       rm -f postgis-out.xml postgis_aggs_mm.xml
 
 maintainer-clean: clean
-       @rm -f html/*.html \
-               postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
+       rm -f postgis_comments.sql raster_comments.sql topology_comments.sql tiger_geocoder_comments.sql
 
 comments: postgis_comments.sql raster_comments.sql topology_comments.sql tiger_geocoder_comments.sql
 cheatsheets: postgis_cheatsheet.html raster_cheatsheet.html topology_cheatsheet.html tiger_geocoder_cheatsheet.html

diff --git a/make_dist.sh b/make_dist.sh
index 6732a34b06ce05bbe7b1a19085d7975335c1d2d9..ed25c4c77135c05c9fa477d1cc7401c5fb4b9a6b 100644 (file)
--- a/make_dist.sh
+++ b/make_dist.sh
@@ -43,36 +43,24 @@ echo "Removing .cvsignore and make_dist.sh files"
 find "$outdir" -name .cvsignore -exec rm {} \;
 rm -f "$outdir"/make_dist.sh "$outdir"/HOWTO_RELEASE
 
-# generating configure script
+# generating configure script and configuring
 echo "Running autogen.sh; ./configure"
 owd="$PWD"
 cd "$outdir"
 ./autogen.sh
 ./configure
-make
+#make
 cd "$owd"
 
-# generating documentation
-echo "Generating documentation images"
-owd="$PWD"
-cd "$outdir"/doc/html/image_src
-sleep 1 # wait some time 
-make images 
-if [ $? -gt 0 ]; then
-       exit 1
-fi
-cd "$owd"
-
-# generating documentation
+# generating comments
 echo "Generating documentation"
 owd="$PWD"
 cd "$outdir"/doc
-sleep 2 # wait some time to have 'make' recognize it needs to build html
-make 
+make comments
 if [ $? -gt 0 ]; then
        exit 1
 fi
-make clean # won't drop the html dir, or postgis_comments.sql
+make clean # won't drop the comment files
 cd "$owd"
 
 # Run make distclean