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

[bug-gnats]

The following reply was made to PR gnats/669; it has been noted by GNATS.

From: Stephane Chazelas <address@hidden>
To: address@hidden
Cc: 
Subject: Re: gnats/669: Re: gnats/669: missing @XXX@ keyword substitutions in 
do_subst
Date: Wed, 9 Aug 2006 19:26:12 +0100

 On Wed, Aug 09, 2006 at 12:55:01PM -0500, address@hidden wrote:
 > The following reply was made to PR gnats/669; it has been noted by GNATS.
 > 
 > From: Stephane Chazelas <address@hidden>
 > To: address@hidden
 > Cc: 
 > Subject: Re: gnats/669: missing @XXX@ keyword substitutions in do_subst
 > Date: Wed, 9 Aug 2006 18:45:59 +0100
 > 
 >  Actually, one can't do that this way reliably.
 >  
 >  for instance the 
 >  
 >  s,@ECHO_C@,$(ECHO_C),g
 >  
 >  doesn't work because it is expanded to
 >  
 >  s,@ECHO_C@,\c,g
 >  
 >  which should have been:
 >  
 >  s,@ECHO_C@,\\c,g
 >  
 >  The substitution done by autoconf take care of that by escaping
 >  the ",", "\" and "&" characters. It's not easy to do that
 >  portably with the Makefile approach.
 >  
 >  Is there any reason why the substitutions are done at the make
 >  time instead of at the configure time by the autoconf dedicated
 >  routine?
 [...]
 
 new suggested fix:
 
 
 Remove common.am
 
 Index: configure.ac
 ===================================================================
 RCS file: /sources/gnats/gnats/configure.ac,v
 retrieving revision 1.2
 diff -u -r1.2 configure.ac
 --- configure.ac       31 Dec 2005 21:52:52 -0000      1.2
 +++ configure.ac       9 Aug 2006 18:20:56 -0000
 @@ -160,7 +160,7 @@
  AC_MSG_RESULT($GNATSD_USER_ACCESS_FILE)
  
  AC_MSG_CHECKING([for --enable-gnatsd-host-access-file])
 -if test "$ac_cv_use_gnats_host_access_file" != "no" ; then
 +if test "$ac_cv_use_gnatsd_host_access_file" != "no" ; then
        GNATSD_HOST_ACCESS_FILE=$ac_cv_use_gnatsd_host_access_file
  else
        GNATSD_HOST_ACCESS_FILE=${sysconfdir}/gnatsd.host_access
 @@ -397,5 +397,17 @@
  # ***** End of configuration section *****
  
  AC_CONFIG_FILES([Makefile gnats/Makefile gnats/ds-file/Makefile \
 -      doc/Makefile doc/man/Makefile])
 +      doc/Makefile doc/man/Makefile \
 +      doc/man/databases.man doc/man/dbconfig.man doc/man/delete-pr.man \
 +      doc/man/edit-pr.man doc/man/file-pr.man doc/man/gen-index.man \
 +      doc/man/getclose.man doc/man/gnatsd.man doc/man/gnats.man \
 +      doc/man/install-sid.man  doc/man/mkcat.man \
 +      doc/man/mkdb.man doc/man/pr-edit.man doc/man/query-pr.man \
 +      doc/man/queue-pr.man doc/man/rmcat.man doc/man/send-pr.conf.man \
 +      doc/man/send-pr.man gnats/at-pr gnats/check-db gnats/dbconfig \
 +      gnats/delete-pr gnats/diff-prs gnats/edit-pr gnats/file-pr \
 +      gnats/databases:gnats/gnats-databases.in gnats/install-sid \
 +      gnats/mail-agent gnats/mail-query gnats/mkcat gnats/mkdb \
 +      gnats/rmcat gnats/send-pr])
 +
  AC_OUTPUT
 Index: doc/Makefile.am
 ===================================================================
 RCS file: /sources/gnats/gnats/doc/Makefile.am,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.am
 --- doc/Makefile.am    31 Dec 2005 21:52:52 -0000      1.2
 +++ doc/Makefile.am    9 Aug 2006 18:21:00 -0000
 @@ -19,7 +19,6 @@
  # Notes: version.texi is computed automatically by automake.
  # Additionally, texinfo.tex is included when you run ``automake 
--add-missing''
  # 
------------------------------------------------------------------------------
 -include $(top_srcdir)/common.am
  
  SUBDIRS = man
  
 Index: doc/man/Makefile.am
 ===================================================================
 RCS file: /sources/gnats/gnats/doc/man/Makefile.am,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.am
 --- doc/man/Makefile.am        31 Dec 2005 21:52:52 -0000      1.2
 +++ doc/man/Makefile.am        9 Aug 2006 18:21:02 -0000
 @@ -19,8 +19,6 @@
  # 02111, USA.
  # 
------------------------------------------------------------------------------
  
 -include $(top_srcdir)/common.am
 -
  EXTRA_DIST = Makefile.in databases.man.in dbconfig.man.in delete-pr.man.in \
        edit-pr.man.in file-pr.man.in gen-index.man.in getclose.man.in \
        gnats.man.in gnatsd.man.in install-sid.man.in mkcat.man.in \
 @@ -33,9 +31,4 @@
  man8_MANS = file-pr.man delete-pr.man gen-index.man getclose.man gnatsd.man \
        install-sid.man mkdb.man mkcat.man queue-pr.man rmcat.man pr-edit.man
  
 -CLEANFILES = *.man
 -
 -%.man: $(srcdir)/%.man.in
 -      $(do_subst) < $< > $@
 -
  # vim:ft=make ts=8 sw=8 noet tw=80:
 Index: gnats/Makefile.am
 ===================================================================
 RCS file: /sources/gnats/gnats/gnats/Makefile.am,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.am
 --- gnats/Makefile.am  31 Dec 2005 21:52:52 -0000      1.2
 +++ gnats/Makefile.am  9 Aug 2006 18:21:04 -0000
 @@ -77,53 +77,8 @@
  dist_lisp_DATA = gnats.el
  ELCFILES = 
  
 -# Scripts
 -bin_SCRIPTS = edit-pr send-pr install-sid
 -libexec_SCRIPTS = at-pr check-db delete-pr diff-prs file-pr mail-agent \
 -      mail-query mkcat mkdb rmcat
 -
 -CLEANFILES = $(bin_SCRIPTS) $(libexec_SCRIPTS) version.c fconfig.c \
 -      fconfig.y fconfigl.c fconfig.h fconfig.tab.c fconfig.tab.h \
 -      dbconfig databases
 -
 -at-pr: at-pr.sh Makefile
 -      $(do_subst) < $(srcdir)/at-pr.sh > at-pr
 -
 -check-db: check-db.sh Makefile
 -      $(do_subst) < $(srcdir)/check-db.sh > check-db
 -
 -delete-pr: delete-pr.sh Makefile
 -      $(do_subst) < $(srcdir)/delete-pr.sh > delete-pr
 -
 -diff-prs: diff-prs.sh Makefile
 -      $(do_subst) < $(srcdir)/diff-prs.sh > diff-prs
 -
 -mkcat: mkcat.sh Makefile
 -      $(do_subst) < $(srcdir)/mkcat.sh > mkcat
 -
 -mkdb: mkdb.sh Makefile
 -      $(do_subst) < $(srcdir)/mkdb.sh > mkdb
 -
 -rmcat: rmcat.sh Makefile
 -      $(do_subst) < $(srcdir)/rmcat.sh > rmcat
 -
 -edit-pr: edit-pr.sh Makefile
 -      $(do_subst) < $(srcdir)/edit-pr.sh > edit-pr
 -
 -file-pr: file-pr.sh Makefile
 -      $(do_subst) < $(srcdir)/file-pr.sh > file-pr
 -
 -install-sid: install-sid.sh Makefile
 -      $(do_subst) < $(srcdir)/install-sid.sh > install-sid
 -
 -mail-query: mail-query.sh Makefile
 -      $(do_subst) < $(srcdir)/mail-query.sh > mail-query
 -
 -mail-agent: mail-agent.sh Makefile
 -      $(do_subst) < $(srcdir)/mail-agent.sh > mail-agent
 -
 -send-pr: send-pr.sh Makefile
 -      $(do_subst) < $(srcdir)/send-pr.sh > send-pr
 +CLEANFILES = version.c fconfig.c \
 +      fconfig.y fconfigl.c fconfig.h fconfig.tab.c fconfig.tab.h
  
  version.c: Makefile
        echo 'const char *version_string = "$(VERSION)";' > address@hidden
 @@ -145,12 +100,6 @@
  data_DATA = dbconfig
  sysconf_DATA = databases gnatsd.user_access gnatsd.host_access
  
 -dbconfig: dbconfig.in Makefile
 -      $(do_subst) < $(srcdir)/dbconfig.in > dbconfig
 -
 -databases: gnats-databases.in Makefile
 -      $(do_subst) < $(srcdir)/gnats-databases.in > databases
 -
  # We need to link in defaults database config files for for mkdb
  install-data-hook:
        mkdir -p $(DESTDIR)/$(sysconfdir)/defaults && \
 Index: gnats/ds-file/Makefile.am
 ===================================================================
 RCS file: /sources/gnats/gnats/gnats/ds-file/Makefile.am,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.am
 --- gnats/ds-file/Makefile.am  31 Dec 2005 21:52:53 -0000      1.2
 +++ gnats/ds-file/Makefile.am  9 Aug 2006 18:21:08 -0000
 @@ -22,7 +22,6 @@
  # This file is included in $(top_srcdir)/gnats/Makefile.am.  Construct path
  # names accordingly.
  # 
------------------------------------------------------------------------------
 -include $(top_srcdir)/common.am
  
  EXTRA_DIST = t-fconfig ds-file.h
  
 
 -- 
 Stephane