From: Regina Obe <lr@pcorp.us>
Date: Sat, 4 May 2013 19:42:30 +0000 (+0000)
Subject: change epub to be built in html so relative search for images doesn't break, fix... 
X-Git-Tag: 2.1.0beta2~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55e0df93159217fd1be3ef16a5a3566ab7146931;p=postgis

change epub to be built in html so relative search for images doesn't break, fix deprecated links

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

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9099ea367..1d6f6b3e0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -230,7 +230,7 @@ postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSIO
 		   -o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf $<; \
 	fi
 	
-postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub: postgis-out.xml images $(XML_INPUTS)
+html/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub: postgis-out.xml images $(XML_INPUTS)
 	if test x"$(DBTOEPUB)" = x; then \
 	   echo "Error: dbtoepub not found, can't build epub"; \
 	   echo "       try installing dbtoepub"; \
@@ -239,7 +239,7 @@ postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSIO
 		$(DBTOEPUB) $<; \
 	fi
 
-epub: postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub
+epub: html/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub
 
 pdf: postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf
 
@@ -264,7 +264,7 @@ images-clean:
 clean: 
 	rm -f html/*.html
 	rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
-	rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.epub
+	rm -f html/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.epub
 	$(MAKE) -C html/image_src clean
 	rm -f $(XML_GENERATED_SOURCES)
 
@@ -346,7 +346,7 @@ requirements_not_met_xsltproc:
 	@echo "Install xsltproc and then re-run configure. Alternatively "
 	@echo "refer to online manual:"
 	@echo
-	@echo "  http://www.postgis.org/docs"
+	@echo "  http://postgis.net/documentation"
 	@echo
 
 requirements_not_met_xmllint:
@@ -356,7 +356,7 @@ requirements_not_met_xmllint:
 	@echo "Install xmllint and then re-run configure. Alternatively "
 	@echo "refer to online manual:"
 	@echo
-	@echo "  http://www.postgis.org/docs"
+	@echo "  http://postgis.net/documentation"
 	@echo
 
 requirements_not_met_xslbase:
@@ -376,6 +376,6 @@ requirements_not_met_imagemagick:
 	@echo "To build the documentation, install ImageMagick and then re-run configure. Alternatively "
 	@echo "refer to online manual:"
 	@echo
-	@echo "  http://www.postgis.org/docs"
+	@echo "  http://postgis.net/documentation"
 	@echo