gnats/669: missing @XXX@ keyword substitutions in do_subst

[bug-gnats]

>Number:         669
>Category:       gnats
>Synopsis:       missing @XXX@ keyword substitutions in do_subst
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    unassigned
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Aug 09 11:45:01 -0500 2006
>Originator:     Stephane Chazelas <address@hidden>
>Release:        
>Description:
 
 Hi guys,
 
 I'm not too sure of that as I'm not an autotool expert, but I'm
 under the impression that there are some @XXX@ keywords that are
 missing in common.am and some are unncessary:
 
 $ diff -u <(grep -ho '@[a-zA-Z_]*@' doc/man/*.man.in gnats/*.sh 
gnats/dbconfig.in gnats/gnats-databases.in| sort -u) <(tr -d '][' < common.am | 
grep -ho '@[a-zA-Z_]*@' | sort -u)
 --- /proc/self/fd/11    2006-08-09 17:11:04.422080848 +0100
 +++ /proc/self/fd/22    2006-08-09 17:11:04.422080848 +0100
 @@ -5,23 +5,22 @@
  @BINDIR@
  @BWEEK_END@
  @BWEEK_START@
 address@hidden@
 address@hidden@
 address@hidden@
  @DEFAULT_MAIL_AGENT@
  @DEFAULT_ORGANIZATION@
  @DEFAULT_RELEASE@
 address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
  @GLOBAL_DB_LIST_FILE@
  @GNATS_DEFAULT_DB_DIR@
 address@hidden@
 address@hidden@
  @GNATS_USER@
  @libexecdir@
  @LIBEXECDIR@
 address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
  @sysconfdir@
 address@hidden@
  @VERSION@
 
 The ECHON and exec_prefix above seem to be useless (in
 send-pr.sh). same for other prefix variables in send-pr and
 install-sid.
 
>Fix:

Index: common.am
===================================================================
RCS file: /sources/gnats/gnats/common.am,v
retrieving revision 1.1
diff -u -r1.1 common.am
--- common.am   31 Oct 2005 05:03:16 -0000      1.1
+++ common.am   9 Aug 2006 16:34:07 -0000
@@ -22,17 +22,11 @@
 DEFS = @DEFS@ -DGNATSD_USER_ACCESS_FILE=\"${GNATSD_USER_ACCESS_FILE}\" 
-DGNATSD_HOST_ACCESS_FILE=\"${GNATSD_HOST_ACCESS_FILE}\" 
-DDEFAULT_GNATS_SERVICE=\"${DEFAULT_GNATS_SERVICE}\" 
-DGLOBAL_DB_LIST_FILE=\"${GLOBAL_DB_LIST_FILE}\" -DGNATS_USER=\"${GNATS_USER}\"
 
 # Most of the substitution that needs to happen
-do_subst = sed -e 's,address@hidden@],$(datadir),g' \
-       -e 's,address@hidden@],$(datadir),g' \
-       -e 's,address@hidden@],$(PACKAGE),g' \
-       -e 's,address@hidden@],$(VERSION),g' \
+do_subst = sed -e 's,address@hidden@],$(VERSION),g' \
        -e 's,address@hidden@],$(bindir),g' \
        -e 's,address@hidden@],$(bindir),g' \
-       -e 's,address@hidden@],$(sbindir),g' \
-       -e 's,address@hidden@],$(sbindir),g' \
        -e 's,address@hidden@],$(libexecdir),g' \
        -e 's,address@hidden@],$(libexecdir),g' \
-       -e 's,address@hidden@],$(sysconfdir),g' \
        -e 's,address@hidden@],$(sysconfdir),g' \
        -e 's,address@hidden@],$(GNATS_DEFAULT_DB_DIR),g' \
        -e 's,address@hidden,$(GNATS_DEFAULT_ADM_DIR),g' \
@@ -45,8 +39,14 @@
        -e 's,address@hidden@],$(BWEEK_END),g' \
        -e 's,address@hidden@],$(DEFAULT_MAIL_AGENT),g' \
        -e 's,address@hidden@],$(GLOBAL_DB_LIST_FILE),g' \
-       -e 's,address@hidden@],$(GNATSD_USER_ACCESS_FILE),g' \
-       -e 's,address@hidden@],$(GNATSD_HOST_ACCESS_FILE),g' \
-       -e 's,address@hidden@],$(AWK),g'
+       -e 's,address@hidden@],$(AWK),g' \
+       -e 's,address@hidden@],$(configure_input),g' \
+       -e 's,address@hidden@],$(ECHO_C),g' \
+       -e 's,address@hidden@],$(ECHO_N),g' \
+       -e 's,address@hidden@],$(MKTEMP),g' \
+       -e 's,address@hidden@],$(PACKAGE_VERSION),g' \
+       -e 's,address@hidden@],$(PASSWD),g' \
+       -e 's,address@hidden@],$(SUBMITTER),g'
+
 
 # vim:ft=make:
Index: gnats/send-pr.sh
===================================================================
RCS file: /sources/gnats/gnats/gnats/send-pr.sh,v
retrieving revision 1.2
diff -u -r1.2 send-pr.sh
--- gnats/send-pr.sh    31 Dec 2005 21:52:52 -0000      1.2
+++ gnats/send-pr.sh    9 Aug 2006 16:34:07 -0000
@@ -35,10 +35,7 @@
 SUBMITTER="@SUBMITTER@"
 
 # The place where our usual binaries live.
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
 bindir="@bindir@"
-sbindir="@bindir@"
 sysconfdir="@sysconfdir@"
 libexecdir="@libexecdir@"
 
@@ -54,8 +51,6 @@
 # Is the mktemp command available?
 MKTEMP="@MKTEMP@"
 
address@hidden@
-
 # By default send-pr connects directly to the database.  However, it
 # can be configured to use an existing template file by setting the
 # TEMPLATE variable below to point to a PR template generated from
Index: gnats/install-sid.sh
===================================================================
RCS file: /sources/gnats/gnats/gnats/install-sid.sh,v
retrieving revision 1.2
diff -u -r1.2 install-sid.sh
--- gnats/install-sid.sh        31 Dec 2005 21:52:52 -0000      1.2
+++ gnats/install-sid.sh        9 Aug 2006 16:34:07 -0000
@@ -23,7 +23,6 @@
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 VERSION="@PACKAGE_VERSION@"
-prefix="@prefix@"
 sysconfdir="@sysconfdir@"
 
 COMMAND=`echo $0 | sed -e 's,.*/,,g'`