Simplify <link> regex cleanup code.

bmomjian · bmomjian · commit aa198e5f14c0 · 2006-10-07T23:48:52.000Z
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.79 2006/10/07 23:28:04 momjian Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.80 2006/10/07 23:48:52 momjian Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -192,7 +192,7 @@ INSTALL.html: standalone-install.sgml installation.sgml version.sgml
 HISTORY.html: release.sgml
 	( echo '<!doctype appendix PUBLIC "-//OASIS//DTD DocBook V4.2//EN">'; \
 	  cat $< ) | \
-	$(PERL) -p -0 -e 's/<link[\n\s]+linkend[^>]*>//sg' | \
+	$(PERL) -p -0 -e 's/<link\s+linkend[^>]*>//g' | \
 	$(PERL) -p -e 's/<\/link>//g' >tempfile_HISTORY.sgml
 	$(JADE.text) -V nochunks tempfile_HISTORY.sgml >$@
 	rm tempfile_HISTORY.sgml

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.79 2006/10/07 23:28:04 momjian Exp $`
	`5`	`+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.80 2006/10/07 23:48:52 momjian Exp $`
`6`	`6`	`#`
`7`	`7`	`#----------------------------------------------------------------------------`
`8`	`8`
`@@ -192,7 +192,7 @@ INSTALL.html: standalone-install.sgml installation.sgml version.sgml`
`192`	`192`	`HISTORY.html: release.sgml`
`193`	`193`	`( echo '<!doctype appendix PUBLIC "-//OASIS//DTD DocBook V4.2//EN">'; \`
`194`	`194`	`cat $< ) \| \`
`195`		`- $(PERL) -p -0 -e 's/<link[\n\s]+linkend[^>]*>//sg' \| \`
	`195`	`+ $(PERL) -p -0 -e 's/<link\s+linkend[^>]*>//g' \| \`
`196`	`196`	`$(PERL) -p -e 's/<\/link>//g' >tempfile_HISTORY.sgml`
`197`	`197`	`$(JADE.text) -V nochunks tempfile_HISTORY.sgml >$@`
`198`	`198`	`rm tempfile_HISTORY.sgml`