summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2007-04-04 10:56:28 +0000
committerBruno Haible <bruno@clisp.org>2007-04-04 10:56:28 +0000
commitcc3edd6e92694c6a540f668b27079c6b11572ea2 (patch)
tree7593eee6ea146f1671f2f92ad2788f4228329acf
parentcacfc561fbe41c465d0fca68ebd0b00485ccd166 (diff)
downloadgperf-cc3edd6e92694c6a540f668b27079c6b11572ea2.tar.gz
Support for newer GNU standards. Don't ignore the --htmldir etc. configure
options.
-rw-r--r--ChangeLog13
-rw-r--r--doc/Makefile.in11
-rw-r--r--doc/configure.ac7
3 files changed, 20 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 39c2e11..986a45e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2007-04-04 Bruno Haible <bruno@clisp.org>
+ Support for newer GNU standards.
+ * doc/configure.ac (mandir): Remove assignment.
+ * doc/Makefile.in (datarootdir): New variable.
+ (docdir, dvidir, psdir, pdfdir, htmldir): Use value determined by
+ autoconf.
+ * configure: Regenerated with autoconf-2.61.
+ * doc/configure: Likewise.
+ * lib/configure: Likewise.
+ * src/configure: Likewise.
+ * tests/configure: Likewise.
+
+2007-04-04 Bruno Haible <bruno@clisp.org>
+
* doc/Makefile.in (MAKEINFO): Disable also the LC_MESSAGES and LC_ALL
environment variables.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index eb08a0d..e68bc63 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -30,15 +30,16 @@ srcdir = @srcdir@
prefix = @prefix@
local_prefix = /usr/local
exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
datadir = @datadir@
infodir = @infodir@
mandir = @mandir@
man1dir = $(mandir)/man1
-docdir = $(datadir)/doc/@PACKAGE@
-dvidir = $(docdir)
-psdir = $(docdir)
-pdfdir = $(docdir)
-htmldir = $(docdir)
+docdir = @docdir@
+dvidir = @dvidir@
+psdir = @psdir@
+pdfdir = @pdfdir@
+htmldir = @htmldir@
# Programs used by "make":
RM = rm -f
diff --git a/doc/configure.ac b/doc/configure.ac
index 0c6a190..bc0e064 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -1,6 +1,6 @@
dnl autoconf configuration for gperf/doc
-dnl Copyright (C) 1998, 2000, 2002-2003 Free Software Foundation, Inc.
+dnl Copyright (C) 1998, 2000, 2002-2003, 2007 Free Software Foundation, Inc.
dnl Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
dnl and Bruno Haible <bruno@clisp.org>.
dnl
@@ -26,11 +26,6 @@ PACKAGE=gperf
AC_SUBST(PACKAGE)
AC_PROG_MAKE_SET
dnl
-dnl installation directories
-dnl
-dnl Prefer modern Filesystem Hierarchy Standard over antiquated GNU standards.
-test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
-dnl
dnl checks for programs
dnl
CL_PROG_INSTALL