[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Findutils-patches] [PATCH 2/2] updatedb: use the common definitions of

From: James Youngman
Subject: [Findutils-patches] [PATCH 2/2] updatedb: use the common definitions of the bug-report URL etc.
Date: Sun, 24 Jan 2016 23:24:29 +0000

* locate/ (updatedb): Substitute PACKAGE_BUGREPORT,
PACKAGE_BUGREPORT_URL and PACKAGE_URL.  We do this in the Makefile
directly since is not an output file generated
directly by configure (instead, it's generated by the Makefile
preprocessor macro.  In order to get a similar effect for
substituted output files, we need to use AC_SUBST.  Hence
introduce a shell variable $bugreport_url which we pass to both
AC_SUBST and AC_DEFINE_UNQUOTED (replacing the previous call to
* locate/ (usage): Use PACKAGE_URL and PACKAGE_BUGREPORT_URL.
---       | 16 +++++++++++++---
 locate/ |  3 +++
 locate/ |  5 +++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ b/
index 0a60a26..528d442 100644
--- a/
+++ b/
@@ -20,13 +20,23 @@ dnl Written by James Youngman.
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT([GNU findutils], 4.7.0-git, address@hidden)
+dnl Set the bug-report URL
 dnl The call to AC_INIT causes AC_PACKAGE_BUGREPORT to be defined
 dnl and we've used an email address.  However, we would also like to
 dnl specify at URL at which to report bugs (and in fact we prefer
 dnl people to use that).  Se we define that here, too.
-         ["";],
-         [URL at which bugs should be reported])
+dnl Ensure that PACKAGE_BUGREPORT_URL shows up n config.h so that
+dnl it can be picked up by bugreport.c.
+                   [URL at which bugs should be reported])
+dnl Also ensure that it is substituted in output files so that it
+dnl turns up in locate/Makefile so that we can generate the correct
+dnl content in the updatedb script.
diff --git a/locate/ b/locate/
index ba30d01..97401bf 100644
--- a/locate/
+++ b/locate/
@@ -42,6 +42,9 @@ updatedb: Makefile
        -e "s,@""LOCATE_DB""@,$(LOCATE_DB)," \
        -e "s,@""VERSION""@,$(VERSION)," \
        -e "s,@""PACKAGE_NAME""@,$(PACKAGE_NAME)," \
+       -e "s,@""PACKAGE_URL""@,$(PACKAGE_URL)," \
        -e "s,@""find""@,$${find}," \
        -e "s,@""frcode""@,$${frcode}," \
        -e "s,@""bigram""@,$${bigram}," \
diff --git a/locate/ b/locate/
index 20feb01..80da575 100644
--- a/locate/
+++ b/locate/
@@ -54,10 +54,11 @@ Usage: $0 [--findoptions='-option1 -option2...']
        [--output=dbfile] [--netuser=user] [--localuser=user]
        [--old-format] [--dbformat] [--version] [--help]
+Please see also the documentation at @address@hidden
 Report (and track progress on fixing) bugs in the updatedb
 program via the @PACKAGE_NAME@ bug-reporting page at
- or, if
-you have no web access, by sending email to @address@hidden
address@hidden@ or, if
+you have no web access, by sending email to <@PACKAGE_BUGREPORT@>.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]