From 0c0e0ddbb4f535afa59e1603da6d3047f3e6e11a Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 19 Aug 2000 16:15:17 +0000
Subject: [PATCH] Install the doc in /usr/share/doc/gperf, not
 /usr/share/{html,dvi}.

---
 ChangeLog        |  5 +++++
 doc/Makefile.in  | 10 ++++++++--
 doc/configure.in |  4 +++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3af8853..c2c0b91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-08-19  Bruno Haible  <bruno@linuix.math.u-bordeaux.fr>
 
+        * doc/configure.in (PACKAGE): New variable.
+        * doc/Makefile.in (datadir, docdir): New variables.
+          (dvidir, htmldir): Change values.
+          (install, installdirs): Update.
+
         * src/configure.in: Rename cache variable gp_cxx_throw_decl to
           gp_cv_cxx_throw_decl.
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 0bb7ef3..c902e92 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -27,11 +27,13 @@ srcdir = @srcdir@
 prefix = @prefix@
 local_prefix = /usr/local
 exec_prefix = @exec_prefix@
+datadir = @datadir@
 infodir = @infodir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
-dvidir = $(mandir)/dvi
-htmldir = $(mandir)/html
+docdir = $(datadir)/doc/@PACKAGE@
+dvidir = $(docdir)
+htmldir = $(docdir)
 
 # Programs used by "make":
 RM = rm -f
@@ -94,6 +96,8 @@ install : all force
 	if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
 	if [ ! -d $(DESTDIR)$(man1dir) ] ; then mkdir $(DESTDIR)$(man1dir) ; fi
 	$(INSTALL_DATA) $(srcdir)/gperf.1 $(DESTDIR)$(man1dir)/gperf.1
+	if [ ! -d $(DESTDIR)$(datadir)/doc ] ; then mkdir $(DESTDIR)$(datadir)/doc ; fi
+	if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
 	if [ ! -d $(DESTDIR)$(dvidir) ] ; then mkdir $(DESTDIR)$(dvidir) ; fi
 	$(INSTALL_DATA) $(srcdir)/gperf.dvi $(DESTDIR)$(dvidir)/gperf.dvi
 	if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
@@ -103,6 +107,8 @@ installdirs : force
 	if [ ! -d $(DESTDIR)$(infodir) ] ; then mkdir $(DESTDIR)$(infodir) ; fi
 	if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
 	if [ ! -d $(DESTDIR)$(man1dir) ] ; then mkdir $(DESTDIR)$(man1dir) ; fi
+	if [ ! -d $(DESTDIR)$(datadir)/doc ] ; then mkdir $(DESTDIR)$(datadir)/doc ; fi
+	if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
 	if [ ! -d $(DESTDIR)$(dvidir) ] ; then mkdir $(DESTDIR)$(dvidir) ; fi
 	if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
 
diff --git a/doc/configure.in b/doc/configure.in
index f72482c..944b862 100644
--- a/doc/configure.in
+++ b/doc/configure.in
@@ -1,6 +1,6 @@
 dnl autoconf configuration for gperf/doc
 
-dnl Copyright (C) 1998 Free Software Foundation, Inc.
+dnl Copyright (C) 1998, 2000 Free Software Foundation, Inc.
 dnl written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 dnl
 dnl This file is part of GNU GPERF.
@@ -21,6 +21,8 @@ dnl Free Software Foundation, 59 Temple Place - Suite 330, Boston,
 dnl MA 02111-1307, USA.
 
 AC_INIT(gperf.1)
+PACKAGE=gperf
+AC_SUBST(PACKAGE)
 AC_PROG_MAKE_SET
 dnl
 dnl           checks for programs