diff options
| author | Bruno Haible <bruno@clisp.org> | 2003-05-06 08:20:31 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2003-05-06 08:20:31 +0000 |
| commit | 9ff67d7a5204b23f219c4633dd62daef182bc3d3 (patch) | |
| tree | 3781dabdc4343f5349255cd81db2ef2624a251ae | |
| parent | c82b70119a81f6412809d459f9a9b55d81d3354e (diff) | |
| download | gperf-9ff67d7a5204b23f219c4633dd62daef182bc3d3.tar.gz | |
Install the documentation under $(datadir), not $(prefix).
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.msvc | 11 | ||||
| -rw-r--r-- | Makefile.vms | 11 | ||||
| -rw-r--r-- | doc/Makefile.in | 2 | ||||
| -rw-r--r-- | doc/configure.in | 7 |
5 files changed, 32 insertions, 10 deletions
@@ -1,5 +1,16 @@ 2003-04-12 Bruno Haible <bruno@clisp.org> + * doc/configure.in (mandir): Change default value. + * doc/Makefile.in (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. + (install, installdirs): Update. + +2003-04-12 Bruno Haible <bruno@clisp.org> + * README.vms: New file. * Makefile.vms: New file. * Makefile.devel (src/config.h_vms): New rule. diff --git a/Makefile.msvc b/Makefile.msvc index b9343fa..fab0037 100644 --- a/Makefile.msvc +++ b/Makefile.msvc @@ -41,10 +41,11 @@ srcdir = . # Directories used by "make install": prefix = c:\usr exec_prefix = $(prefix) +datadir = $(prefix)\share bindir = $(exec_prefix)\bin -mandir = $(prefix)\man +mandir = $(datadir)\man man1dir = $(mandir)\man1 -docdir = $(prefix)\doc\gperf +docdir = $(datadir)\doc\gperf # Programs used by "make": @@ -155,10 +156,11 @@ install : all force -mkdir $(exec_prefix) -mkdir $(bindir) $(INSTALL_PROGRAM) gperf.exe $(bindir)\gperf.exe + -mkdir $(datadir) -mkdir $(mandir) -mkdir $(man1dir) $(INSTALL_DATA) doc\gperf.1 $(man1dir)\gperf.1 - -mkdir $(prefix)\doc + -mkdir $(datadir)\doc -mkdir $(docdir) $(INSTALL_DATA) doc\gperf.html $(docdir)\gperf.html @@ -166,9 +168,10 @@ installdirs : force -mkdir $(prefix) -mkdir $(exec_prefix) -mkdir $(bindir) + -mkdir $(datadir) -mkdir $(mandir) -mkdir $(man1dir) - -mkdir $(prefix)\doc + -mkdir $(datadir)\doc -mkdir $(docdir) uninstall : force diff --git a/Makefile.vms b/Makefile.vms index 37ec9ec..90f1b47 100644 --- a/Makefile.vms +++ b/Makefile.vms @@ -25,10 +25,11 @@ # Directories used by "make install": prefix = SYS$DATA:[ exec_prefix = $(prefix) +datadir = $(prefix).share bindir = $(exec_prefix).bin -mandir = $(prefix).man +mandir = $(datadir).man man1dir = $(mandir).man1 -docdir = $(prefix).doc.gperf +docdir = $(datadir).doc.gperf # Programs used by "make": @@ -135,10 +136,11 @@ install : all force create /directory $(exec_prefix)] create /directory $(bindir)] $(INSTALL_PROGRAM) gperf.exe $(bindir)]gperf.exe + create /directory $(datadir)] create /directory $(mandir)] create /directory $(man1dir)] $(INSTALL_DATA) [.doc]gperf.1 $(man1dir)]gperf.1 - create /directory $(prefix).doc] + create /directory $(datadir).doc] create /directory $(docdir)] $(INSTALL_DATA) [.doc]gperf.html $(docdir)]gperf.html @@ -146,9 +148,10 @@ installdirs : force create /directory $(prefix)] create /directory $(exec_prefix)] create /directory $(bindir)] + create /directory $(datadir)] create /directory $(mandir)] create /directory $(man1dir)] - create /directory $(prefix).doc] + create /directory $(datadir).doc] create /directory $(docdir)] uninstall : force diff --git a/doc/Makefile.in b/doc/Makefile.in index b4f829f..5be50d1 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -34,7 +34,7 @@ datadir = @datadir@ infodir = @infodir@ mandir = @mandir@ man1dir = $(mandir)/man1 -docdir = $(prefix)/doc/@PACKAGE@ +docdir = $(datadir)/doc/@PACKAGE@ dvidir = $(docdir) psdir = $(docdir) pdfdir = $(docdir) diff --git a/doc/configure.in b/doc/configure.in index a7c0136..d4bce0d 100644 --- a/doc/configure.in +++ b/doc/configure.in @@ -1,6 +1,6 @@ dnl autoconf configuration for gperf/doc -dnl Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc. +dnl Copyright (C) 1998, 2000, 2002-2003 Free Software Foundation, Inc. dnl Written by Douglas C. Schmidt <schmidt@ics.uci.edu> dnl and Bruno Haible <bruno@clisp.org>. dnl @@ -26,6 +26,11 @@ 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 |