Allow HISTORY/history.html to be generated by removing <link> elements,

bmomjian · bmomjian · commit dc1e047baf7a · 2006-10-07T23:28:04.000Z
per suggestion from Peter.  Without this, the main doc links prevent
those files from being built.
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
@@ -2,7 +2,7 @@
 #
 # PostgreSQL documentation makefile
 #
-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.78 2006/10/05 02:04:32 momjian Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.79 2006/10/07 23:28:04 momjian Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -188,9 +188,12 @@ INSTALL HISTORY regress_README: % : %.html
 INSTALL.html: standalone-install.sgml installation.sgml version.sgml
 	$(JADE.text) -V nochunks standalone-install.sgml installation.sgml >$@
 
+# remove links to main documentation
 HISTORY.html: release.sgml
 	( echo '<!doctype appendix PUBLIC "-//OASIS//DTD DocBook V4.2//EN">'; \
-	  cat $< ) >tempfile_HISTORY.sgml
+	  cat $< ) | \
+	$(PERL) -p -0 -e 's/<link[\n\s]+linkend[^>]*>//sg' | \
+	$(PERL) -p -e 's/<\/link>//g' >tempfile_HISTORY.sgml
 	$(JADE.text) -V nochunks tempfile_HISTORY.sgml >$@
 	rm tempfile_HISTORY.sgml
 
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.466 2006/10/07 22:06:25 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.467 2006/10/07 23:28:04 momjian Exp $ -->
 <!--
 
 Typical markup:
@@ -25,7 +25,9 @@ non-ASCII characters            convert to HTML4 entity (&) escapes
 
 wrap long lines
 
-For new features, add links to the documentation sections.
+For new features, add links to the documentation sections.  Use </link>
+so that perl can remove it so HISTORY.html can be created with no
+links to the main documentation.
 
 -->
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# PostgreSQL documentation makefile`
`4`	`4`	`#`
`5`		`-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.78 2006/10/05 02:04:32 momjian Exp $`
	`5`	`+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.79 2006/10/07 23:28:04 momjian Exp $`
`6`	`6`	`#`
`7`	`7`	`#----------------------------------------------------------------------------`
`8`	`8`
`@@ -188,9 +188,12 @@ INSTALL HISTORY regress_README: % : %.html`
`188`	`188`	`INSTALL.html: standalone-install.sgml installation.sgml version.sgml`
`189`	`189`	`$(JADE.text) -V nochunks standalone-install.sgml installation.sgml >$@`
`190`	`190`
	`191`	`+# remove links to main documentation`
`191`	`192`	`HISTORY.html: release.sgml`
`192`	`193`	`( echo '<!doctype appendix PUBLIC "-//OASIS//DTD DocBook V4.2//EN">'; \`
`193`		`- cat $< ) >tempfile_HISTORY.sgml`
	`194`	`+ cat $< ) \| \`
	`195`	`+ $(PERL) -p -0 -e 's/<link[\n\s]+linkend[^>]*>//sg' \| \`
	`196`	`+ $(PERL) -p -e 's/<\/link>//g' >tempfile_HISTORY.sgml`
`194`	`197`	`$(JADE.text) -V nochunks tempfile_HISTORY.sgml >$@`
`195`	`198`	`rm tempfile_HISTORY.sgml`
`196`	`199`