diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-07-26 10:52:45 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-07-26 10:52:45 +0000 |
| commit | f179ef136d4517d0b95fc044816c200e9a27e0e1 (patch) | |
| tree | cc64483f9a2370b7c77a2f887f7d2c1fa22cea47 | |
| parent | e56a7949db331f7c6703bae4c38b1445747a5918 (diff) | |
| download | quilt-f179ef136d4517d0b95fc044816c200e9a27e0e1.tar.gz | |
- Install package documentation into $RPM_DOC_DIR if this
environment variable is set. On RedHat 9 $RPM_DOC_DIR points to
/usr/share/doc/packages, but documentation lives in
/usr/share/doc. This is a bug in RedHat's RPM configuration;
working around it would break other distributions.
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | quilt.changes | 9 | ||||
| -rw-r--r-- | quilt.spec.in | 5 |
4 files changed, 25 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index c9ac0e4..dfd1dc1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,8 +8,8 @@ exec_prefix := @exec_prefix@ bindir := @bindir@ libdir := @libdir@ datadir := @datadir@ +docdir := @docdir@ mandir := $(datadir)/man -docdir := $(datadir)/doc localedir := $(datadir)/locale etcdir := $(subst /usr/etc,/etc,$(prefix)/etc) @@ -213,8 +213,9 @@ install : scripts @INSTALL@ -d $(BUILD_ROOT)$(LIB_DIR) @INSTALL@ -m 755 -s $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/ - @INSTALL@ -d $(BUILD_ROOT)$(docdir)/$(PACKAGE) - @INSTALL@ -m 644 doc/README $(BUILD_ROOT)$(docdir)/$(PACKAGE)/ + @INSTALL@ -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ + @INSTALL@ -m 644 doc/README \ + $(BUILD_ROOT)$(docdir)/$(PACKAGE)/-$(VERSION)/ @INSTALL@ -d $(BUILD_ROOT)$(mandir)/man1 @INSTALL@ -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/ diff --git a/configure.ac b/configure.ac index f23dbec..55dc93f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([quilt],[0.24],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) -AC_REVISION ($Revision: 1.15 $) +AC_REVISION ($Revision: 1.16 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -216,6 +216,14 @@ if test -z "$MSGFMT" ; then AC_MSG_NOTICE([Building without natural language support]) fi +dnl Determine where package documentation is supposed to go +if test -n "$RPM_DOC_DIR" ; then + docdir="$RPM_DOC_DIR" +else + docdir='$(datadir)/doc' +fi +AC_SUBST(docdir) + dnl Check for rpmbuild (v4) vs. rpm (v3) AC_PATH_PROGS(RPMBUILD, [rpmbuild rpm]) AC_SUBST(RPMBUILD) diff --git a/quilt.changes b/quilt.changes index 110b4fd..df013f8 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Sat Jul 26 12:49:36 CEST 2003 - agruen@suse.de + +- Install package documentation into $RPM_DOC_DIR if this + environment variable is set. On RedHat 9 $RPM_DOC_DIR points to + /usr/share/doc/packages, but documentation lives in + /usr/share/doc. This is a bug in RedHat's RPM configuration; + working around it would break other distributions. + +------------------------------------------------------------------- Wed Jul 23 11:44:24 CEST 2003 - agruen@suse.de - Add Autoconf test for rpmbuild vs. rpm (needed for `make rpm'). diff --git a/quilt.spec.in b/quilt.spec.in index 5174fea..a571bb6 100644 --- a/quilt.spec.in +++ b/quilt.spec.in @@ -47,11 +47,12 @@ rm -rf $RPM_BUILD_ROOT /usr/share/quilt/ /usr/lib/quilt/ +/etc/bash_completion.d/quilt /usr/share/locale/*/LC_MESSAGES/quilt.mo -%doc /usr/share/man/man1/guards.1.gz -%doc doc/README +%doc %{_mandir}/man1/guards.1.gz +%doc %{_docdir}/%{name}-%{version}/README %changelog # The changelog is filled in by "make spec". |