Compute $(mandir) and $(docdir) based on $(datadir), not on $(prefix).

26 files changed, 109 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 8173dd7..b89d67e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-12  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.msvc (mandir, docdir): Use datadir instead of prefix.
+
 2003-04-06  Bruno Haible  <bruno@clisp.org>
 
 	* config/install-reloc: Also compile progreloc.c.
diff --git a/Makefile.msvc b/Makefile.msvc
index a5feeac..35c323e 100644
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -44,8 +44,8 @@ includedir = $(prefix)\include
 datadir = $(prefix)\share
 localedir = $(datadir)\locale
 pkgdatadir = $(datadir)\gettext
-mandir = $(prefix)\man
-docdir = $(prefix)\doc\gettext
+mandir = $(datadir)\man
+docdir = $(datadir)\doc\gettext
 emacsdir = $(datadir)\emacs
 lispdir = $(emacsdir)\site-lisp
 
diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 0c88b76..ffdb21a 100644
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-12  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac (mandir): Change default value.
+	* Makefile.msvc (mandir, docdir): Use datadir instead of prefix.
+
 2003-03-30  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.vms: New file.
diff --git a/gettext-runtime/Makefile.msvc b/gettext-runtime/Makefile.msvc
index 40319b0..3c4aa28 100644
--- a/gettext-runtime/Makefile.msvc
+++ b/gettext-runtime/Makefile.msvc
@@ -43,8 +43,8 @@ libdir = $(exec_prefix)\lib
 includedir = $(prefix)\include
 datadir = $(prefix)\share
 localedir = $(datadir)\locale
-mandir = $(prefix)\man
-docdir = $(prefix)\doc\gettext
+mandir = $(datadir)\man
+docdir = $(datadir)\doc\gettext
 
 # Programs used by "make":
 
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 5db4242..a46f440 100644
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -25,6 +25,10 @@ AC_CONFIG_AUX_DIR(../config)
 AM_INIT_AUTOMAKE(gettext-runtime, $VERSION_NUMBER)
 AM_CONFIG_HEADER(config.h)
 
+dnl Installation directories.
+dnl Prefer modern Filesystem Hierarchy Standard over antiquated GNU standards.
+test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/gettext-runtime/intl-java/ChangeLog b/gettext-runtime/intl-java/ChangeLog
index 12553c5..5ed6f51 100644
--- a/gettext-runtime/intl-java/ChangeLog
+++ b/gettext-runtime/intl-java/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-12  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (docdir): Use datadir instead of prefix.
+
 2003-02-22  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am (installdirs): Remove dependency, redundant with
diff --git a/gettext-runtime/intl-java/Makefile.am b/gettext-runtime/intl-java/Makefile.am
index 419baee..e0f4162 100644
--- a/gettext-runtime/intl-java/Makefile.am
+++ b/gettext-runtime/intl-java/Makefile.am
@@ -24,7 +24,7 @@ CLEANFILES =
 RM = rm -f
 
 jardir = $(datadir)/gettext
-docdir = $(prefix)/doc/gettext
+docdir = $(datadir)/doc/gettext
 htmldir = $(docdir)
 
 JAR = @JAR@
diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index fd33d65..9696246 100644
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-12  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (docdir): Use datadir instead of prefix.
+	* Makefile.msvc (datadir): New variable.
+	(sub_docdir): Use it instead of prefix.
+	(install, installdirs): Update.
+	* Makefile.vms (datadir): New variable.
+	(sub_docdir): Use it instead of prefix.
+
 2003-03-30  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.vms: New file.
diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
index 04e486a..cc0a279 100644
--- a/gettext-runtime/libasprintf/Makefile.am
+++ b/gettext-runtime/libasprintf/Makefile.am
@@ -75,7 +75,7 @@ clean-am:
 
 # Documentation.
 
-docdir = $(prefix)/doc/@PACKAGE@
+docdir = $(datadir)/doc/@PACKAGE@
 dvidir = $(docdir)
 psdir = $(docdir)
 pdfdir = $(docdir)
diff --git a/gettext-runtime/libasprintf/Makefile.msvc b/gettext-runtime/libasprintf/Makefile.msvc
index 6119e82..4f2b2f8 100644
--- a/gettext-runtime/libasprintf/Makefile.msvc
+++ b/gettext-runtime/libasprintf/Makefile.msvc
@@ -34,11 +34,12 @@ PREFIX = c:\usr
 # Directories used by "make install":
 prefix = $(PREFIX)
 exec_prefix = $(prefix)
+datadir = $(prefix)\share
 bindir = $(exec_prefix)\bin
 libdir = $(exec_prefix)\lib
 includedir = $(prefix)\include
 # For this subpackage only.
-sub_docdir = $(prefix)\doc\libasprintf
+sub_docdir = $(datadir)\doc\libasprintf
 
 # Programs used by "make":
 
@@ -140,7 +141,8 @@ install : all force
 !endif
 	-mkdir $(libdir)
 	$(INSTALL_DATA) asprintf.lib $(libdir)\asprintf.lib
-	-mkdir $(prefix)\doc
+	-mkdir $(datadir)
+	-mkdir $(datadir)\doc
 	-mkdir $(sub_docdir)
 	$(INSTALL_DATA) autosprintf.html $(sub_docdir)\autosprintf.html
 
@@ -152,7 +154,8 @@ installdirs : force
 	-mkdir $(bindir)
 !endif
 	-mkdir $(libdir)
-	-mkdir $(prefix)\doc
+	-mkdir $(datadir)
+	-mkdir $(datadir)\doc
 	-mkdir $(sub_docdir)
 
 uninstall : force
diff --git a/gettext-runtime/libasprintf/Makefile.vms b/gettext-runtime/libasprintf/Makefile.vms
index e7a7438..99110c9 100644
--- a/gettext-runtime/libasprintf/Makefile.vms
+++ b/gettext-runtime/libasprintf/Makefile.vms
@@ -5,11 +5,12 @@
 # Directories used by "make install":
 prefix = SYS$DATA:[
 exec_prefix = $(prefix)
+datadir = $(prefix).share
 bindir = $(exec_prefix).bin
 libdir = $(exec_prefix).lib
 includedir = $(prefix).include
 # For this subpackage only.
-sub_docdir = $(prefix).doc.libasprintf
+sub_docdir = $(datadir).doc.libasprintf
 
 # Programs used by "make":
 
diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog
index d4c0cf6..797e2db 100644
--- a/gettext-runtime/man/ChangeLog
+++ b/gettext-runtime/man/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-12  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (docdir): Use datadir instead of prefix.
+	* Makefile.msvc (datadir): New variable.
+	(mandir, docdir): Use it instead of prefix.
+	(install, installdirs): Update.
+	* Makefile.vms (datadir): New variable.
+	(mandir, docdir): Use it instead of prefix.
+
 2003-03-30  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.vms: New file.
diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am
index 94c1bb3..c7e9f83 100644
--- a/gettext-runtime/man/Makefile.am
+++ b/gettext-runtime/man/Makefile.am
@@ -19,7 +19,7 @@
 
 VERSION = @VERSION@
 mandir = @mandir@
-docdir = $(prefix)/doc/gettext
+docdir = $(datadir)/doc/gettext
 htmldir = $(docdir)
 
 localedir = $(datadir)/locale
diff --git a/gettext-runtime/man/Makefile.msvc b/gettext-runtime/man/Makefile.msvc
index 7ef708e..97e7818 100644
--- a/gettext-runtime/man/Makefile.msvc
+++ b/gettext-runtime/man/Makefile.msvc
@@ -10,10 +10,11 @@ PREFIX = c:\usr
 
 # Directories used by "make install":
 prefix = $(PREFIX)
-mandir = $(prefix)\man
+datadir = $(prefix)\share
+mandir = $(datadir)\man
 man1dir = $(mandir)\man1
 man3dir = $(mandir)\man3
-docdir = $(prefix)\doc\gettext
+docdir = $(datadir)\doc\gettext
 
 LN = copy
 RM = -del
@@ -31,6 +32,7 @@ all :
 
 install : all force
 	-mkdir $(prefix)
+	-mkdir $(datadir)
 	-mkdir $(mandir)
 	-mkdir $(man1dir)
 	$(INSTALL_DATA) gettext.1.in $(man1dir)\gettext.1
@@ -45,7 +47,7 @@ install : all force
 	$(INSTALL_DATA) dcgettext.3 $(man3dir)\dcgettext.3
 	$(INSTALL_DATA) dngettext.3 $(man3dir)\dngettext.3
 	$(INSTALL_DATA) dcngettext.3 $(man3dir)\dcngettext.3
-	-mkdir $(prefix)\doc
+	-mkdir $(datadir)\doc
 	-mkdir $(docdir)
 	$(INSTALL_DATA) gettext.1.html.in $(docdir)\gettext.1.html
 	$(INSTALL_DATA) ngettext.1.html.in $(docdir)\ngettext.1.html
@@ -57,10 +59,11 @@ install : all force
 
 installdirs : force
 	-mkdir $(prefix)
+	-mkdir $(datadir)
 	-mkdir $(mandir)
 	-mkdir $(man1dir)
 	-mkdir $(man3dir)
-	-mkdir $(prefix)\doc
+	-mkdir $(datadir)\doc
 	-mkdir $(docdir)
 
 uninstall : force
diff --git a/gettext-runtime/man/Makefile.vms b/gettext-runtime/man/Makefile.vms
index 39cb029..87b6a7d 100644
--- a/gettext-runtime/man/Makefile.vms
+++ b/gettext-runtime/man/Makefile.vms
@@ -4,10 +4,11 @@
 
 # Directories used by "make install":
 prefix = SYS$DATA:[
-mandir = $(prefix).man
+datadir = $(prefix).share
+mandir = $(datadir).man
 man1dir = $(mandir).man1
 man3dir = $(mandir).man3
-docdir = $(prefix).doc.gettext
+docdir = $(datadir).doc.gettext
 
 LN = copy
 RM = delete
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 7668954..6bf6e2d 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-12  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac (mandir): Change default value.
+	* Makefile.msvc (mandir, docdir): Use datadir instead of prefix.
+
 2003-04-10  Bruno Haible  <bruno@clisp.org>
 
 	* configure.ac: Invoke gl_FUNC_EACCESS.
diff --git a/gettext-tools/Makefile.msvc b/gettext-tools/Makefile.msvc
index 3b12cf0..05ac6df 100644
--- a/gettext-tools/Makefile.msvc
+++ b/gettext-tools/Makefile.msvc
@@ -44,8 +44,8 @@ includedir = $(prefix)\include
 datadir = $(prefix)\share
 localedir = $(datadir)\locale
 pkgdatadir = $(datadir)\gettext
-mandir = $(prefix)\man
-docdir = $(prefix)\doc\gettext
+mandir = $(datadir)\man
+docdir = $(datadir)\doc\gettext
 emacsdir = $(datadir)\emacs
 lispdir = $(emacsdir)\site-lisp
 
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index fdcf124..966779d 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -25,6 +25,10 @@ AC_CONFIG_AUX_DIR(../config)
 AM_INIT_AUTOMAKE(gettext-tools, $VERSION_NUMBER)
 AM_CONFIG_HEADER(config.h)
 
+dnl Installation directories.
+dnl Prefer modern Filesystem Hierarchy Standard over antiquated GNU standards.
+test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index f1b248b..df0affb 100644
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-12  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (docdir): Use datadir instead of prefix.
+	* Makefile.msvc (datadir): New variable.
+	(docdir): Use it instead of prefix.
+	(install, installdirs): Update.
+	* Makefile.vms (datadir): New variable.
+	(docdir): Use it instead of prefix.
+
 2003-03-30  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.vms: New file.
diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index 418a307..6c2dc82 100644
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -17,7 +17,7 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-docdir = $(prefix)/doc/gettext
+docdir = $(datadir)/doc/gettext
 dvidir = $(docdir)
 psdir = $(docdir)
 pdfdir = $(docdir)
diff --git a/gettext-tools/doc/Makefile.msvc b/gettext-tools/doc/Makefile.msvc
index 13f7612..49685cb 100644
--- a/gettext-tools/doc/Makefile.msvc
+++ b/gettext-tools/doc/Makefile.msvc
@@ -10,7 +10,8 @@ PREFIX = c:\usr
 
 # Directories used by "make install":
 prefix = $(PREFIX)
-docdir = $(prefix)\doc\gettext
+datadir = $(prefix)\share
+docdir = $(datadir)\doc\gettext
 
 LN = copy
 RM = -del
@@ -28,13 +29,15 @@ all :
 
 install : all force
 	-mkdir $(prefix)
-	-mkdir $(prefix)\doc
+	-mkdir $(datadir)
+	-mkdir $(datadir)\doc
 	-mkdir $(docdir)
 	$(INSTALL_DATA) gettext_*.html $(docdir)
 
 installdirs : force
 	-mkdir $(prefix)
-	-mkdir $(prefix)\doc
+	-mkdir $(datadir)
+	-mkdir $(datadir)\doc
 	-mkdir $(docdir)
 
 uninstall : force
diff --git a/gettext-tools/doc/Makefile.vms b/gettext-tools/doc/Makefile.vms
index 4c26731..8a53153 100644
--- a/gettext-tools/doc/Makefile.vms
+++ b/gettext-tools/doc/Makefile.vms
@@ -4,7 +4,8 @@
 
 # Directories used by "make install":
 prefix = SYS$DATA:[
-docdir = $(prefix).doc.gettext
+datadir = $(prefix).share
+docdir = $(datadir).doc.gettext
 
 LN = copy
 RM = delete
diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog
index ed383eb..20d0d58 100644
--- a/gettext-tools/man/ChangeLog
+++ b/gettext-tools/man/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-12  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (docdir): Use datadir instead of prefix.
+	* Makefile.msvc (datadir): New variable.
+	(mandir, docdir): Use it instead of prefix.
+	(install, installdirs): Update.
+	* Makefile.vms (datadir): New variable.
+	(mandir, docdir): Use it instead of prefix.
+
 2003-03-30  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.vms: New file.
diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am
index 67b6723..f44ec4c 100644
--- a/gettext-tools/man/Makefile.am
+++ b/gettext-tools/man/Makefile.am
@@ -19,7 +19,7 @@
 
 VERSION = @VERSION@
 mandir = @mandir@
-docdir = $(prefix)/doc/gettext
+docdir = $(datadir)/doc/gettext
 htmldir = $(docdir)
 
 localedir = $(datadir)/locale
diff --git a/gettext-tools/man/Makefile.msvc b/gettext-tools/man/Makefile.msvc
index 138a6b7..de0120a 100644
--- a/gettext-tools/man/Makefile.msvc
+++ b/gettext-tools/man/Makefile.msvc
@@ -10,9 +10,10 @@ PREFIX = c:\usr
 
 # Directories used by "make install":
 prefix = $(PREFIX)
-mandir = $(prefix)\man
+datadir = $(prefix)\share
+mandir = $(datadir)\man
 man1dir = $(mandir)\man1
-docdir = $(prefix)\doc\gettext
+docdir = $(datadir)\doc\gettext
 
 LN = copy
 RM = -del
@@ -30,6 +31,7 @@ all :
 
 install : all force
 	-mkdir $(prefix)
+	-mkdir $(datadir)
 	-mkdir $(mandir)
 	-mkdir $(man1dir)
 	$(INSTALL_DATA) msgcmp.1 $(man1dir)\msgcmp.1
@@ -47,7 +49,7 @@ install : all force
 	$(INSTALL_DATA) msggrep.1 $(man1dir)\msggrep.1
 	$(INSTALL_DATA) msginit.1 $(man1dir)\msginit.1
 	$(INSTALL_DATA) msguniq.1 $(man1dir)\msguniq.1
-	-mkdir $(prefix)\doc
+	-mkdir $(datadir)\doc
 	-mkdir $(docdir)
 	$(INSTALL_DATA) msgcmp.1.html $(docdir)\msgcmp.1.html
 	$(INSTALL_DATA) msgfmt.1.html $(docdir)\msgfmt.1.html
@@ -67,9 +69,10 @@ install : all force
 
 installdirs : force
 	-mkdir $(prefix)
+	-mkdir $(datadir)
 	-mkdir $(mandir)
 	-mkdir $(man1dir)
-	-mkdir $(prefix)\doc
+	-mkdir $(datadir)\doc
 	-mkdir $(docdir)
 
 uninstall : force
diff --git a/gettext-tools/man/Makefile.vms b/gettext-tools/man/Makefile.vms
index c237372..53c84ff 100644
--- a/gettext-tools/man/Makefile.vms
+++ b/gettext-tools/man/Makefile.vms
@@ -4,9 +4,10 @@
 
 # Directories used by "make install":
 prefix = SYS$DATA:[
-mandir = $(prefix).man
+datadir = $(prefix).share
+mandir = $(datadir).man
 man1dir = $(mandir).man1
-docdir = $(prefix).doc.gettext
+docdir = $(datadir).doc.gettext
 
 LN = copy
 RM = delete