8000 Set SQL man pages to be section 7 by default, and only transform them to · postgrespro/postgres_cluster@d129255 · GitHub
[go: up one dir, main page]
Skip to content

Commit d129255

Browse files
peterepetere
committed
Set SQL man pages to be section 7 by default, and only transform them to
another section if required by the platform (instead of the old way of building them in section "l" and always transforming them to the platform-specific section). This speeds up the installation on common platforms, and it avoids some funny business with the man page tools and build process.
1 parent e339ed5 commit d129255

File tree

144 files changed

+287
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+287
-176
lines changed

‎doc/Makefile‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/doc/Makefile,v 1.31 2008/03/18 16:24:50 petere Exp $
7+
# $PostgreSQL: pgsql/doc/Makefile,v 1.32 2008/11/14 10:22:45 petere Exp $
88
#
99
#----------------------------------------------------------------------------
1010

@@ -45,2 BB94 6 +45,30 @@ sqlmansectnum = $(shell expr X'$(sqlmansect)' : X'\([0-9]\)')
4545

4646
all: man1/.timestamp man$(sqlmansectnum)/.timestamp
4747

48-
man1/.timestamp: man$(sqlmansect_dummy)/.timestamp
48+
man1/.timestamp: man7/.timestamp
4949
@echo timestamp >$@
5050

51-
man$(sqlmansect_dummy)/.timestamp: man.tar.gz
51+
man7/.timestamp: man.tar.gz
5252
gzip -d -c $< | $(TAR) xf -
53+
ifneq ($(sqlmansectnum),7)
5354
for file in man1/*.1; do \
5455
mv $$file $$file.bak && \
55-
sed -e 's/\\fR($(sqlmansect_dummy))/\\fR($(sqlmansectnum))/' $$file.bak >$$file && \
56+
sed -e 's/\\fR(7)/\\fR($(sqlmansectnum))/g' $$file.bak >$$file && \
5657
rm -f $$file.bak || exit; \
5758
done
59+
endif
5860
@echo timestamp >$@
5961

60-
man$(sqlmansectnum)/.timestamp: man$(sqlmansect_dummy)/.timestamp
62+
ifneq ($(sqlmansectnum),7)
63+
man$(sqlmansectnum)/.timestamp: man7/.timestamp
6164
$(mkinstalldirs) man$(sqlmansectnum)
62-
for file in man$(sqlmansect_dummy)/*.$(sqlmansect_dummy); do \
63-
sed -e '/^\.TH/s/"$(sqlmansect_dummy)"/"$(sqlmansect)"/' \
64-
-e 's/\\fR($(sqlmansect_dummy))/\\fR($(sqlmansectnum))/' \
65-
$$file >man$(sqlmansectnum)/`basename $$file | sed 's/.$(sqlmansect_dummy)$$/.$(sqlmansect)/'` || exit; \
65+
for file in man7/*.7; do \
66+
sed -e '/^\.TH/s/"7"/"$(sqlmansect)"/' \
67+
-e 's/\\fR(7)/\\fR($(sqlmansectnum))/g' \
68+
$$file >man$(sqlmansectnum)/`basename $$file | sed 's/.7$$/.$(sqlmansect)/'` || exit; \
6669
done
6770
@echo timestamp >$@
71+
endif
6872
endif # found_man
6973

7074

@@ -93,10 +97,10 @@ ifdef found_html
9397
rm -f $(addprefix $(DESTDIR)$(htmldir)/html/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | tar tf -))
9498
endif
9599
ifdef found_man
96-
rm -f $(addprefix $(DESTDIR)$(mandir)/, $(shell gunzip -c $(srcdir)/man.tar.gz | tar tf - | sed -e 's,man$(sqlmansect_dummy)/,man$(sqlmansectnum)/,' -e 's/.$(sqlmansect_dummy)$$/.$(sqlmansect)/'))
100+
rm -f $(addprefix $(DESTDIR)$(mandir)/, $(shell gunzip -c $(srcdir)/man.tar.gz | tar tf - | sed -e 's,man7/,man$(sqlmansectnum)/,' -e 's/.7$$/.$(sqlmansect)/'))
97101
endif
98102

99103

100104
clean distclean maintainer-clean:
101-
rm -rf man1/ man$(sqlmansectnum)/ man$(sqlmansect_dummy)/
105+
rm -rf man1/ man7/ man$(sqlmansectnum)/
102106
$(MAKE) -C src $@

‎doc/src/Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Postgres documentation makefile
2-
# $PostgreSQL: pgsql/doc/src/Makefile,v 1.33 2006/12/02 01:25:50 petere Exp $
2+
# $PostgreSQL: pgsql/doc/src/Makefile,v 1.34 2008/11/14 10:22:45 petere Exp $
33

44
subdir = doc/src
55
top_builddir = ../..
@@ -18,5 +18,4 @@ postgres.tar:
1818

1919
man.tar:
2020
$(MAKE) -C sgml man
21-
rm sgml/man$(sqlmansect_dummy)/spi_*
22-
$(TAR) -cf $@ -C sgml man1 man$(sqlmansect_dummy)
21+
$(TAR) -cf $@ -C sgml man1 man7

‎doc/src/sgml/Makefile‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# PostgreSQL documentation makefile
44
#
5-
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.111 2008/11/12 16:01:51 petere Exp $
5+
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.112 2008/11/14 10:22:45 petere Exp $
66
#
77
#----------------------------------------------------------------------------
88

@@ -65,19 +65,20 @@ override SPFLAGS += -wall -wno-unused-param -wno-empty -wfully-tagged
6565

6666
.PHONY: html man draft clean
6767

68-
DEFAULTSECTION = $(sqlmansect_dummy)
68+
DEFAULTSECTION = l
6969

7070
fix_man_xrefs = $(PERL) -npi -e 's{\[XRef to GUC-([A-Z0-9-]*)\]}{($$l = $$1) =~ tr/A-Z-/a-z_/, $$l}ge || s{\[XRef to [A-Z0-9-]*\]}{in the documentation}g'
7171

7272
man: postgres.sgml $(ALLSGML)
7373
$(NSGMLS) $(NSGMLS_FLAGS) $(SGMLINCLUDE) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
7474
# One more time, to resolve cross-references
7575
$(NSGMLS) $(NSGMLS_FLAGS) $(SGMLINCLUDE) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
76-
$(fix_man_xrefs) *.1 *.$(DEFAULTSECTION)
77-
$(mkinstalldirs) man1 man$(DEFAULTSECTION)
76+
$(fix_man_xrefs) *.1 *.7
77+
$(mkinstalldirs) man1 man7
7878
$(D2MLINKS) < manpage.links
7979
mv *.1 man1/
80-
mv *.$(DEFAULTSECTION) man$(DEFAULTSECTION)/
80+
mv *.7 man7/
81+
rm *.$(DEFAULTSECTION)
8182

8283

8384
##
@@ -280,9 +281,10 @@ DOCBOOK2MAN = docbook2x-man
280281

281282
manx: postgres.xml stylesheet-man.xsl
282283
$(DOCBOOK2MAN) --solinks -s $(srcdir)/stylesheet-man.xsl --string-param default-manpage-section=$(DEFAULTSECTION) $<
283-
$(mkinstalldirs) man1 man$(DEFAULTSECTION)
284+
$(mkinstalldirs) man1 man7
284285
mv *.1 man1/
285-
mv *.$(DEFAULTSECTION) man$(DEFAULTSECTION)/
286+
mv *.7 man7/
287+
rm *.$(DEFAULTSECTION)
286288

287289

288290
##
@@ -302,7 +304,7 @@ clean distclean maintainer-clean:
302304
# HTML
303305
rm -f HTML.manifest *.html
304306
# man
305-
rm -rf *.1 *.$(DEFAULTSECTION) man1 man$(DEFAULTSECTION) manpage.refs manpage.links manpage.log
307+
rm -rf *.1 *.7 *.$(DEFAULTSECTION) man1 man7 manpage.refs manpage.links manpage.log
306308
# print
307309
rm -f *.rtf *.tex-ps *.tex-pdf *.dvi *.aux *.log *.ps *.pdf *.out *.fot
308310
# index

‎doc/src/sgml/ref/abort.sgml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/abort.sgml,v 1.17 2006/09/16 00:30:16 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/abort.sgml,v 1.18 2008/11/14 10:22:45 petere Exp $
33
PostgreSQL documentation
44
-->
55

66
<refentry id="SQL-ABORT">
77
<refmeta>
88
<refentrytitle id="sql-abort-title">ABORT</refentrytitle>
9+
<manvolnum>7</manvolnum>
910
<refmiscinfo>SQL - Language Statements</refmiscinfo>
1011
</refmeta>
1112

‎doc/src/sgml/ref/alter_aggregate.sgml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_aggregate.sgml,v 1.9 2006/09/16 00:30:16 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_aggregate.sgml,v 1.10 2008/11/14 10:22:45 petere Exp $
33
PostgreSQL documentation
44
-->
55

66
<refentry id="SQL-ALTERAGGREGATE">
77
<refmeta>
88
<refentrytitle id="SQL-ALTERAGGREGATE-TITLE">ALTER AGGREGATE</refentrytitle>
9+
<manvolnum>7</manvolnum>
910
<refmiscinfo>SQL - Language Statements</refmiscinfo>
1011
</refmeta>
1112

‎doc/src/sgml/ref/alter_conversion.sgml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_conversion.sgml,v 1.8 2006/09/16 00:30:16 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_conversion.sgml,v 1.9 2008/11/14 10:22:45 petere Exp $
33
PostgreSQL documentation
44
-->
55

66
<refentry id="SQL-ALTERCONVERSION">
77
<refmeta>
88
<refentrytitle id="SQL-ALTERCONVERSION-TITLE">ALTER CONVERSION</refentrytitle>
9+
<manvolnum>7</manvolnum>
910
<refmiscinfo>SQL - Language Statements</refmiscinfo>
1011
</refmeta>
1112

‎doc/src/sgml/ref/alter_database.sgml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.21 2008/11/07 18:25:06 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.22 2008/11/14 10:22:45 petere Exp $
33
PostgreSQL documentation
44
-->
55

66
<refentry id="SQL-ALTERDATABASE">
77
<refmeta>
88
<refentrytitle id="sql-alterdatabase-title">ALTER DATABASE</refentrytitle>
9+
<manvolnum>7</manvolnum>
910
<refmiscinfo>SQL - Language Statements</refmiscinfo>
1011
</refmeta>
1112

‎doc/src/sgml/ref/alter_domain.sgml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.23 2008/11/12 15:53:34 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.24 2008/11/14 10:22:45 petere Exp $
33
PostgreSQL documentation
44
-->
55

66
<refentry id="SQL-ALTERDOMAIN">
77
<refmeta>
88
<refentrytitle id="sql-alterdomain-title">ALTER DOMAIN</refentrytitle>
9+
<manvolnum>7</manvolnum>
910
<refmiscinfo>SQL - Language Statements</refmiscinfo>
1011
</refmeta>
1112

‎doc/src/sgml/ref/alter_function.sgml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_function.sgml,v 1.16 2008/07/16 01:30:21 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_function.sgml,v 1.17 2008/11/14 10:22:45 petere Exp $
33
PostgreSQL documentation
44
-->
55

66
<refentry id="SQL-ALTERFUNCTION">
77
<refmeta>
88
<refentrytitle id="SQL-ALTERFUNCTION-TITLE">ALTER FUNCTION</refentrytitle>
9+
<manvolnum>7</manvolnum>
910
<refmiscinfo>SQL - Language Statements</refmiscinfo>
1011
</refmeta>
1112

‎doc/src/sgml/ref/alter_group.sgml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_group.sgml,v 1.17 2006/09/16 00:30:16 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_group.sgml,v 1.18 2008/11/14 10:22:45 petere Exp $
33
PostgreSQL documentation
44
-->
55

66
<refentry id="SQL-ALTERGROUP">
77
<refmeta>
88
<refentrytitle id="SQL-ALTERGROUP-title">ALTER GROUP</refentrytitle>
9+
<manvolnum>7</manvolnum>
910
<refmiscinfo>SQL - Language Statements</refmiscinfo>
1011
</refmeta>
1112

0 commit comments

Comments
 (0)
0