Move the *.3 manual pages to the gettext-runtime package.

5 files changed, 79 insertions, 56 deletions

diff --git a/PACKAGING b/PACKAGING
index ed753eb..44d80ec 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -46,20 +46,31 @@ following file list.
 
    gettext-runtime
 
+      $prefix/share/gettext/ABOUT-NLS
+
       $prefix/bin/gettext
       $prefix/bin/ngettext
       $prefix/man/man1/gettext.1
       $prefix/man/man1/ngettext.1
       $prefix/doc/gettext/gettext.1.html
       $prefix/doc/gettext/ngettext.1.html
-      $prefix/share/gettext/ABOUT-NLS
-      $prefix/share/gettext/libintl.jar
+      $prefix/share/locale/*/LC_MESSAGES/gettext-runtime.mo
+
       $prefix/lib/libintl.*               (not installed on glibc systems)
       $prefix/lib/charset.alias           (not installed on glibc systems)
       $prefix/share/locale/locale.alias   (not installed on glibc systems)
       $prefix/include/libintl.h           (not installed on glibc systems)
+      $prefix/man/man3/*
+      $prefix/doc/gettext/*.3.html
+
+      $prefix/share/gettext/libintl.jar
+      $prefix/doc/gettext/javadoc1/*
+      $prefix/doc/gettext/javadoc2/*
+
       $prefix/lib/libasprintf.*
       $prefix/include/autosprintf.h
+      $prefix/doc/libasprintf/autosprintf.html
+      $prefix/info/autosprintf.info
 
    gettext-tools
 
@@ -73,24 +84,18 @@ following file list.
       $prefix/man/man1/xgettext.1
       $prefix/man/man1/gettextize.1
       $prefix/man/man1/autopoint.1
-      $prefix/man/man3/*
       $prefix/doc/gettext/msg*.1.html
       $prefix/doc/gettext/xgettext.1.html
       $prefix/doc/gettext/gettextize.1.html
       $prefix/doc/gettext/autopoint.1.html
-      $prefix/doc/gettext/*.3.html
-      $prefix/doc/gettext/javadoc1/*
-      $prefix/doc/gettext/javadoc2/*
       $prefix/doc/gettext/gettext_*.html
-      $prefix/doc/libasprintf/autosprintf.html
       $prefix/info/gettext.info*
-      $prefix/info/autosprintf.info
       $prefix/include/gettext-po.h
       $prefix/lib/libgettextlib*
       $prefix/lib/libgettextsrc*
       $prefix/lib/libgettextpo*
       $prefix/lib/gettext/*
-      $prefix/share/locale/*/LC_MESSAGES/gettext.mo
+      $prefix/share/locale/*/LC_MESSAGES/gettext-tools.mo
       $prefix/share/gettext/config.rpath
       $prefix/share/gettext/mkinstalldirs
       $prefix/share/gettext/intl/*
diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog
index f9fdce9..2bfc643 100644
--- a/gettext-runtime/man/ChangeLog
+++ b/gettext-runtime/man/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-15  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.3.in, ngettext.3.in, textdomain.3.in, bindtextdomain.3.in,
+	bind_textdomain_codeset.3.in: Moved here from ../../gettext-tools/man.
+	* dgettext.3, dcgettext.3, dngettext.3, dcngettext.3: Likewise.
+	* Makefile.am: Add rules for man3 manual pages.
+
 2003-02-12  Bruno Haible  <bruno@clisp.org>
 
 	Extracted from gettext package.
diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am
index ba08928..369bf8a 100644
--- a/gettext-runtime/man/Makefile.am
+++ b/gettext-runtime/man/Makefile.am
@@ -30,18 +30,28 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 
 man_aux = gettext.x ngettext.x
 
+# Likewise, plus additional manual pages for the libintl functions.
+
 man_MAN1GEN = gettext.1 ngettext.1
 man_MAN1IN = gettext.1.in ngettext.1.in
 man_MAN1 = $(man_MAN1GEN)
-man_MANS = $(man_MAN1)
+man_MAN3 = gettext.3 ngettext.3 \
+textdomain.3 bindtextdomain.3 bind_textdomain_codeset.3
+man_MAN3IN = gettext.3.in ngettext.3.in \
+textdomain.3.in bindtextdomain.3.in bind_textdomain_codeset.3.in
+man_MAN3LINK = dgettext.3 dcgettext.3 dngettext.3 dcngettext.3
+man_MANS = $(man_MAN1) $(man_MAN3) $(man_MAN3LINK)
 
 man_HTMLGEN = gettext.1.html ngettext.1.html
 man_HTMLIN = gettext.1.html.in ngettext.1.html.in
-man_HTML = $(man_HTMLGEN)
+man_HTMLOTHER = \
+gettext.3.html ngettext.3.html \
+textdomain.3.html bindtextdomain.3.html bind_textdomain_codeset.3.html
+man_HTML = $(man_HTMLGEN) $(man_HTMLOTHER)
 
-EXTRA_DIST = help2man $(man_aux) $(man_MAN1IN) $(man_HTMLIN)
+EXTRA_DIST = help2man $(man_aux) $(man_MAN1IN) $(man_MAN3) $(man_MAN3IN) $(man_MAN3LINK) $(man_HTMLIN) $(man_HTMLOTHER)
 CLEANFILES = $(man_MAN1GEN) $(man_HTMLGEN)
-MAINTAINERCLEANFILES = $(man_MAN1IN) $(man_HTMLIN)
+MAINTAINERCLEANFILES = $(man_MAN1IN) $(man_MAN3) $(man_HTMLIN) $(man_HTMLOTHER)
 
 PERL = @PERL@
 RM = rm -f
@@ -84,6 +94,22 @@ ngettext.1.in: ngettext.x
 # Depend on version.sh to get version number changes.
 $(man_MAN1): help2man $(top_srcdir)/../version.sh
 
+gettext.3: gettext.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/gettext.3.in > t-$@
+	mv t-$@ $@
+ngettext.3: ngettext.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/ngettext.3.in > t-$@
+	mv t-$@ $@
+textdomain.3: textdomain.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/textdomain.3.in > t-$@
+	mv t-$@ $@
+bindtextdomain.3: bindtextdomain.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bindtextdomain.3.in > t-$@
+	mv t-$@ $@
+bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../version.sh
+	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bind_textdomain_codeset.3.in > t-$@
+	mv t-$@ $@
+
 
 # Man pages in HTML format.
 
@@ -103,6 +129,22 @@ ngettext.1.html.in: ngettext.1.in
 	$(MAN2HTML) `if test -f ngettext.1.in; then echo .; else echo $(srcdir); fi`/ngettext.1.in | sed -e '/CreationDate:/d' > t-$@
 	mv t-$@ $@
 
+gettext.3.html: gettext.3.in
+	$(MAN2HTML) $(srcdir)/gettext.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
+ngettext.3.html: ngettext.3.in
+	$(MAN2HTML) $(srcdir)/ngettext.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
+textdomain.3.html: textdomain.3.in
+	$(MAN2HTML) $(srcdir)/textdomain.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
+bindtextdomain.3.html: bindtextdomain.3.in
+	$(MAN2HTML) $(srcdir)/bindtextdomain.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
+bind_textdomain_codeset.3.html: bind_textdomain_codeset.3.in
+	$(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
+
 install-html:
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
 	for file in $(man_HTML); do \
diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog
index 42bffe9..bcf55c9 100644
--- a/gettext-tools/man/ChangeLog
+++ b/gettext-tools/man/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-15  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.3.in, ngettext.3.in, textdomain.3.in, bindtextdomain.3.in,
+	bind_textdomain_codeset.3.in: Move to ../../gettext-runtime/man.
+	* dgettext.3, dcgettext.3, dngettext.3, dcngettext.3: Likewise.
+	* Makefile.am: Remove rules for man3 manual pages.
+
 2003-02-12  Bruno Haible  <bruno@clisp.org>
 
 	Big restructuring.
diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am
index ada6a50..31d2f31 100644
--- a/gettext-tools/man/Makefile.am
+++ b/gettext-tools/man/Makefile.am
@@ -34,30 +34,23 @@ msgcmp.x msgfmt.x msgmerge.x msgunfmt.x xgettext.x \
 msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msgfilter.x msggrep.x msginit.x msguniq.x \
 gettextize.x autopoint.x
 
-# Likewise, plus additional manual pages for the libintl functions.
+# Likewise.
 
 man_MAN1OTHER = \
 msgcmp.1 msgfmt.1 msgmerge.1 msgunfmt.1 xgettext.1 \
 msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msgfilter.1 msggrep.1 msginit.1 msguniq.1 \
 gettextize.1 autopoint.1
 man_MAN1 = $(man_MAN1OTHER)
-man_MAN3 = gettext.3 ngettext.3 \
-textdomain.3 bindtextdomain.3 bind_textdomain_codeset.3
-man_MAN3IN = gettext.3.in ngettext.3.in \
-textdomain.3.in bindtextdomain.3.in bind_textdomain_codeset.3.in
-man_MAN3LINK = dgettext.3 dcgettext.3 dngettext.3 dcngettext.3
-man_MANS = $(man_MAN1) $(man_MAN3) $(man_MAN3LINK)
+man_MANS = $(man_MAN1)
 
 man_HTMLOTHER = \
 msgcmp.1.html msgfmt.1.html msgmerge.1.html msgunfmt.1.html xgettext.1.html \
 msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html msgexec.1.html msgfilter.1.html msggrep.1.html msginit.1.html msguniq.1.html \
-gettextize.1.html autopoint.1.html \
-gettext.3.html ngettext.3.html \
-textdomain.3.html bindtextdomain.3.html bind_textdomain_codeset.3.html
+gettextize.1.html autopoint.1.html
 man_HTML = $(man_HTMLOTHER)
 
-EXTRA_DIST = help2man $(man_aux) $(man_MAN1OTHER) $(man_MAN3) $(man_MAN3IN) $(man_MAN3LINK) $(man_HTMLOTHER) ChangeLog.0
-MAINTAINERCLEANFILES = $(man_MAN1OTHER) $(man_MAN3) $(man_HTMLOTHER)
+EXTRA_DIST = help2man $(man_aux) $(man_MAN1OTHER) $(man_HTMLOTHER) ChangeLog.0
+MAINTAINERCLEANFILES = $(man_MAN1OTHER) $(man_HTMLOTHER)
 
 PERL = @PERL@
 RM = rm -f
@@ -124,22 +117,6 @@ autopoint.1: autopoint.x
 # Depend on version.sh to get version number changes.
 $(man_MAN1): help2man $(top_srcdir)/../version.sh
 
-gettext.3: gettext.3.in $(top_srcdir)/../version.sh
-	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/gettext.3.in > t-$@
-	mv t-$@ $@
-ngettext.3: ngettext.3.in $(top_srcdir)/../version.sh
-	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/ngettext.3.in > t-$@
-	mv t-$@ $@
-textdomain.3: textdomain.3.in $(top_srcdir)/../version.sh
-	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/textdomain.3.in > t-$@
-	mv t-$@ $@
-bindtextdomain.3: bindtextdomain.3.in $(top_srcdir)/../version.sh
-	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bindtextdomain.3.in > t-$@
-	mv t-$@ $@
-bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../version.sh
-	sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bind_textdomain_codeset.3.in > t-$@
-	mv t-$@ $@
-
 
 # Man pages in HTML format.
 
@@ -196,21 +173,6 @@ gettextize.1.html: gettextize.1
 autopoint.1.html: autopoint.1
 	$(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
 	mv t-$@ $@
-gettext.3.html: gettext.3.in
-	$(MAN2HTML) $(srcdir)/gettext.3.in | sed -e '/CreationDate:/d' > t-$@
-	mv t-$@ $@
-ngettext.3.html: ngettext.3.in
-	$(MAN2HTML) $(srcdir)/ngettext.3.in | sed -e '/CreationDate:/d' > t-$@
-	mv t-$@ $@
-textdomain.3.html: textdomain.3.in
-	$(MAN2HTML) $(srcdir)/textdomain.3.in | sed -e '/CreationDate:/d' > t-$@
-	mv t-$@ $@
-bindtextdomain.3.html: bindtextdomain.3.in
-	$(MAN2HTML) $(srcdir)/bindtextdomain.3.in | sed -e '/CreationDate:/d' > t-$@
-	mv t-$@ $@
-bind_textdomain_codeset.3.html: bind_textdomain_codeset.3.in
-	$(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
-	mv t-$@ $@
 
 install-html:
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)