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

diff --git a/ChangeLog b/ChangeLog
index 8173dd72e5e2d64fd9cd7d4a9292a42ef800618a..b89d67efa668445ca70a84191511c10b329faedd 100644 (file)
--- 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 a5feeac165e3901a72a23723b978d15a2d017240..35c323e967892d48b603e24d4392ac8b28b1f6d8 100644 (file)
--- 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 0c88b76527e6c623687c73099c0606d201d49aa2..ffdb21a9c1a5df691842787f0438223ac51a857c 100644 (file)
--- 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 40319b01809dd0b3269f8942a61862d5c9a41dba..3c4aa28a648871616b1ee3e44bc94b017380ae5c 100644 (file)
--- 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 5db4242126aa4ae120e78e747512f92f8cbfc650..a46f440ae7bc965fcf605bd3543924794bb12ff5 100644 (file)
--- 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 12553c5185544f027755db3b3011ecba7dad6da2..5ed6f518cba59e1c393d4d139a20976d48efe5f0 100644 (file)
--- 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 419baee67681a3631f45db24b8e82b58702dcf0b..e0f41621ddfe1b60e49eb599ba575850af4f3522 100644 (file)
--- 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 fd33d651f550bba0c523c381a12becb439a1a728..969624619a3fe387765cc98504bf637e777fa106 100644 (file)
--- 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 04e486ae78d421a4b2e0c0d7c0068c684ca6de04..cc0a2798712334fe00043fbe1cbf7bcaefc87ae6 100644 (file)
--- 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 6119e829af7a7e687f3fe1afea3b56fd2b79341a..4f2b2f8418ba935680b9715c734bdc7fa1571d2b 100644 (file)
--- 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 e7a743887dfe3483bd1e72d4e0657da2e37c6d87..99110c983a0c9d3d83b3fc49e5ca57b088720531 100644 (file)
--- 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 d4c0cf6e9be73fd4e7a361f0718e566b33a08705..797e2dbf31143d9907141370c60313f4824be07f 100644 (file)
--- 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 94c1bb3a46e0d7e48240d98b9df3810ee6f3f577..c7e9f832d0367c8ad9de7c37646d2ba4a46ec73b 100644 (file)
--- 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 7ef708ec8cbfbd5f2d46013744c539e3f5f7b325..97e78183d31512a50179d643b4346746d610ba06 100644 (file)
--- 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 39cb029d636e1e123c9f66a033064beee10365ac..87b6a7db0c06bf340a407a6ffd8a83f8ce22a47c 100644 (file)
--- 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 76689542748fc2542642697db70362b3f442a17b..6bf6e2de23476b5c1c4826293fd1eddb9a7cb89f 100644 (file)
--- 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 3b12cf0f8d021fe51422aff99b7057951d9b7ba1..05ac6dfe1442d451d91edc24dc2629f16af76950 100644 (file)
--- 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 fdcf124a99da85725731938b82d12c8df779547c..966779d261c4842b8c139ed62b3fd41388bd788e 100644 (file)
--- 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 f1b248b2e197d93c19e47c011dc77c5b71f0fea3..df0affbc7badd53451556b70a38dba2dade486ad 100644 (file)
--- 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 418a307b4625a812cd0db203587a869678359566..6c2dc822707723cc7fe7e288a8f231fcac993ffd 100644 (file)
--- 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 13f7612bbf4448d8c4715ff70b1366e3ae4211e0..49685cb4e20c717d9b533f0bf457a881f5aecb1d 100644 (file)
--- 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 4c267313fb90371300c2c12e0c6ca302ccbc3157..8a53153d3dbb114cf440aa02f22361ab4be83861 100644 (file)
--- 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 ed383ebc94545667fe0d109dd6202c5c29bda3e5..20d0d58695ee4cb3a7fe80e97be75e1b7176979d 100644 (file)
--- 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 67b67235b4c0fdf2adbb394aadd436db2338b620..f44ec4c9707a0a446f06c2fdfc9182f79dd67b71 100644 (file)
--- 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 138a6b7f122132589bd272cf8f72a0f3d6fef3f1..de0120a9f021dd2e78a34a9688e4f578b18133f3 100644 (file)
--- 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 c2373722babf9c1e9b87223b6e44307800d25a0e..53c84ff7f19b96d6284c2f5fc87001faad6b0311 100644 (file)
--- 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