]> granicus.if.org Git - postgis/commitdiff
switch back to rout but attempt a -I include
authorRegina Obe <lr@pcorp.us>
Sat, 4 May 2013 20:04:08 +0000 (20:04 +0000)
committerRegina Obe <lr@pcorp.us>
Sat, 4 May 2013 20:04:08 +0000 (20:04 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@11354 b70326c6-7e19-0410-871a-916f4a2858ee

doc/Makefile.in

index 1d6f6b3e097d2e67d4953ccfb525f9b7a0c3249b..44532654711079a50f1f367bfb11a6d6d196c14c 100644 (file)
@@ -230,16 +230,17 @@ postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSIO
                   -o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf $<; \
        fi
        
-html/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub: postgis-out.xml images $(XML_INPUTS)
+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"; \
           false; \
        else \
-               $(DBTOEPUB) $<; \
+               $(DBTOEPUB) -I "${PWD}/html" \
+                 $<; \
        fi
 
-epub: html/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub
+epub: 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 +265,7 @@ images-clean:
 clean: 
        rm -f html/*.html
        rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
-       rm -f html/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.epub
+       rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.epub
        $(MAKE) -C html/image_src clean
        rm -f $(XML_GENERATED_SOURCES)