From 205e0b9c8843585f8ff7f855fbadd6083faf6d34 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 17 Jul 2004 11:00:34 +0000 Subject: [PATCH] * lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.html, ?!GENERIC?%DEST_PREFIX%.html): Use $(X), not ${X}. --- ChangeLog | 3 +++ lib/am/texibuild.am | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32798f62..08136627 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-07-17 Alexandre Duret-Lutz + * lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.html, + ?!GENERIC?%DEST_PREFIX%.html): Use $(X), not ${X}. + * tests/installdir.test: installdirs-local should appear three times, since the change from 2004-07-11 will make it PHONY. diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index d71b2c45..db9ba42d 100644 --- a/lib/am/texibuild.am +++ b/lib/am/texibuild.am @@ -86,18 +86,18 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% ## in the manual change, it may leave unused pages. Our fix ## is to build under a temporary name, and replace the target on ## success. - rm -rf ${@:.html=.htp} + rm -rf $(@:.html=.htp) if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \ -?GENERIC? -o ${@:.html=.htp} %SOURCE%; \ -?!GENERIC? -o ${@:.html=.htp} `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \ +?GENERIC? -o $(@:.html=.htp) %SOURCE%; \ +?!GENERIC? -o $(@:.html=.htp) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \ then \ rm -rf $@; \ ## Work around a bug in Texinfo 4.1 (-o foo.html outputs files in foo/ ## instead of foo.html/). - if test ! -d ${@:.html=.htp} && test -d $(@:.html=); then \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ else \ - if test ! -d ${@:.html=.htp} && test -d $(@:.html=); then \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ exit 1; \ fi -- 2.43.5