[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: two maintainer-check nits
From: |
Alexandre Duret-Lutz |
Subject: |
FYI: two maintainer-check nits |
Date: |
Mon, 27 Dec 2004 22:18:28 +0100 |
User-agent: |
Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3.50 (gnu/linux) |
I'm installing this on HEAD, and the texinfo.am chunk on branch-1-9.
2004-12-27 Alexandre Duret-Lutz <address@hidden>
* Makefile.am (maintainer-check): Refine check for @_ in scalar
context. Check for correct use of PRE_INSTALL, NORMAL_INSTALL,
POST_INSTALL, PRE_UNINSTALL, NORMAL_UNINSTALL, and POST_UNINSTALL.
* lib/am/texinfos.am (uninstall-info-am): Hide the invocation of
$(PRE_UNINSTALL).
Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.237
diff -u -r1.237 Makefile.am
--- Makefile.am 13 Dec 2004 21:21:50 -0000 1.237
+++ Makefile.am 27 Dec 2004 21:16:27 -0000
@@ -143,6 +143,13 @@
echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
exit 1; \
else :; fi
+## Make sure all calls to PRE/NORMAL/POST_INSTALL/UNINSTALL
+ @if grep -E -n '\((PRE|NORMAL|POST)_(|UN)INSTALL\)' \
+ $(srcdir)/lib/am/[a-z]*.am | \
+ grep -v ':##' | grep -v ': @\$$('; then \
+ echo "Found incorrect use of PRE/NORMAL/POST_INSTALL/UNINSTALL in the
lines above" 1>&2; \
+ exit 1; \
+ else :; fi
## We never want to use "undef", only "delete", but for $/.
@if grep -n -w 'undef ' $(srcdir)/automake.in | \
grep -F -v 'undef $$/'; then \
@@ -161,7 +168,7 @@
exit 1; \
fi
## Using @_ in a scalar context is most probably a programming error.
- @if grep -Hn '[^) ] *= address@hidden' $(srcdir)/automake.in; then \
+ @if grep -Hn 'address@hidden) ] *= address@hidden'
$(srcdir)/automake.in; then \
echo "Using @_ in a scalar context in the lines above." 1>&2; \
exit 1; \
fi
Index: lib/am/texinfos.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/texinfos.am,v
retrieving revision 1.113
diff -u -r1.113 texinfos.am
--- lib/am/texinfos.am 27 Dec 2004 20:43:41 -0000 1.113
+++ lib/am/texinfos.am 27 Dec 2004 21:16:29 -0000
@@ -197,7 +197,7 @@
if %?LOCAL-TEXIS%
uninstall-info-am:
- $(PRE_UNINSTALL)
+ @$(PRE_UNINSTALL)
## Run two loops here so that we can handle PRE_UNINSTALL and
## NORMAL_UNINSTALL correctly.
@if (install-info --version && \
--
Alexandre Duret-Lutz
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: two maintainer-check nits,
Alexandre Duret-Lutz <=