* HTML documentation no longer built by default

* "make install" only installs .sgml and .png files
* Added --enable-html option to configure if separate HTML docs desired
* Added "html" and "install-html" targets to documentation Makefiles


svn: r938

doc/extending-gramps/C/Makefile.in

@@ -3,16 +3,25 @@ include @top_srcdir@/Makefile.comm
 MANSRC = ${EG}.sgml
 MANDIR = ${EG}
 
-all: ${MANDIR}/index.html
+
+html: ${MANDIR}/index.html
 
 ${MANDIR}/index.html: ${MANSRC}
-	db2html ${MANSRC} -o ${MANDIR}
+	-${DB2HTML} ${MANSRC} -o ${MANDIR}
+	-rm -rf ${MANSC}.junk/
 	
 install:
+	-${INSTALL} -d ${GNOMEHELP}/${EG}/C
+	-${INSTALL} -m 644 ${MANSRC} ${GNOMEHELP}/${EG}/C
+
+# We only install the .html files since .png's 
+# should already be there from the normal install
+install-html:
 	-${INSTALL} -d ${GNOMEHELP}/${EG}/C
 	-${INSTALL} -m 644 ${EG}/*.html ${GNOMEHELP}/${EG}/C
 
 uninstall:
+	-rm -f ${GNOMEHELP}/${EG}/C/*.sgml
 	-rm -f ${GNOMEHELP}/${EG}/C/*.html
 	-rmdir ${GNOMEHELP}/${EG}/C/
 

doc/gramps-manual/C/Makefile.in

@@ -3,22 +3,29 @@ include @top_srcdir@/Makefile.comm
 MANSRC = ${GM}.sgml
 MANDIR = ${GM}
 
-all: ${MANDIR}/index.html
+html: ${MANDIR}/index.html
 
 ${MANDIR}/index.html: ${MANSRC}
 	${DB2HTML} ${MANSRC} -o ./tmp
 	mv ./tmp/*.html ./${MANDIR}.junk
-	rmdir ./tmp
-	mv ${MANDIR}/stylesheet-images ./${MANDIR}.junk/
+	-rmdir ./tmp
+	-mv ${MANDIR}/stylesheet-images ./${MANDIR}.junk/
 	rm -rf ${MANDIR}
 	mv ./${MANDIR}.junk ${MANDIR}
 	
 install:
 	-${INSTALL} -d ${GNOMEHELP}/${GM}/C
-	-${INSTALL} -m 644 ${GM}/*.html ${GNOMEHELP}/${GM}/C
+	-${INSTALL} -m 644 ${MANSRC} ${GNOMEHELP}/${GM}/C
 	-${INSTALL} -m 644 ${GM}/*.png ${GNOMEHELP}/${GM}/C
 
+# We only install the .html files since .png's 
+# should already be there from the normal install
+install-html:
+	-${INSTALL} -d ${GNOMEHELP}/${GM}/C
+	-${INSTALL} -m 644 ${GM}/*.html ${GNOMEHELP}/${GM}/C
+
 uninstall:
+	-rm -f ${GNOMEHELP}/${GM}/C/*.sgml
 	-rm -f ${GNOMEHELP}/${GM}/C/*.html
 	-rm -f ${GNOMEHELP}/${GM}/C/*.png
 	-rmdir ${GNOMEHELP}/${GM}/C

doc/gramps-manual/C/gramps-manual.sgml

@@ -1861,12 +1861,3 @@ appear in every GRAMPS generated file.
     </para>
   </sect1>
 </article>
-
-
-
-
-
-
-
-
-