[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
PING: 1.4.2a: failure in 47.patsubst
From: |
Eric Blake |
Subject: |
PING: 1.4.2a: failure in 47.patsubst |
Date: |
Wed, 30 Mar 2005 20:05:49 -0700 |
User-agent: |
Mozilla/5.0 (Windows; U; Win98; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax) |
It's been three weeks since I proposed the change to fix the regression in
checks/47.patsubst on branch-1_4, with no response. In the meantime, I also
updated the Makefiles to allow DESTDIR installations. Any word on when
1.4.3 will be released?
2005-03-30 Eric Blake <address@hidden> (tiny change)
* doc/Makefile.in (install, uninstall): Accomodate DESTDIR.
* src/Makefile.in (install, uninstall): Likewise.
* doc/m4.texinfo (Patsubst): Re-add trailing space required by
checks/47.patsubst.
* checks/get-them: Allow for trailing spaces.
--
Someday, I might put a cute statement here.
Eric Blake address@hidden
Index: doc/Makefile.in
===================================================================
RCS file: /cvsroot/m4/m4/doc/Attic/Makefile.in,v
retrieving revision 1.1.1.1.2.2
diff -u -p -r1.1.1.1.2.2 Makefile.in
--- doc/Makefile.in 3 Feb 2005 16:43:12 -0000 1.1.1.1.2.2
+++ doc/Makefile.in 31 Mar 2005 03:24:30 -0000
@@ -57,13 +57,13 @@ stamp-vti: m4.texinfo ../configure.ac
date > $(srcdir)/stamp-vti
install: all
- $(srcdir)/../mkinstalldirs $(infodir)
+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir)
cd $(srcdir) && for file in m4.info*; do \
- $(INSTALL_DATA) $$file $(infodir)/$$file; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \
done
uninstall:
- rm -f $(infodir)/m4.info*
+ rm -f $(DESTDIR)$(infodir)/m4.info*
mostlyclean:
rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.log *.pg *.toc *.tp *.vr
Index: doc/m4.texinfo
===================================================================
RCS file: /cvsroot/m4/m4/doc/m4.texinfo,v
retrieving revision 1.1.1.1.2.2
diff -u -p -r1.1.1.1.2.2 m4.texinfo
--- doc/m4.texinfo 9 Feb 2005 21:44:41 -0000 1.1.1.1.2.2
+++ doc/m4.texinfo 31 Mar 2005 03:24:31 -0000
@@ -24,8 +24,8 @@
@ifnottex
This file documents GNU M4 @value{VERSION}.
-Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004 Free Software
-Foundation, Inc.
+Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005 Free
+Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -2614,7 +2614,7 @@ patsubst(`GNUs not Unix', `\w*', `(\&)')
patsubst(`GNUs not Unix', `\w+', `(\&)')
@result{}(GNUs) (not) (Unix)
patsubst(`GNUs not Unix', `[A-Z][a-z]+')
address@hidden not
address@hidden not @comment
@end example
Here is a slightly more realistic example, which capitalizes individual
Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/m4/m4/src/Attic/Makefile.in,v
retrieving revision 1.1.1.1.2.1
diff -u -p -r1.1.1.1.2.1 Makefile.in
--- src/Makefile.in 3 Feb 2005 16:43:12 -0000 1.1.1.1.2.1
+++ src/Makefile.in 31 Mar 2005 03:24:31 -0000
@@ -1,5 +1,5 @@
# Makefile for GNU m4 sources.
-# Copyright (C) 1994 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2005 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -84,11 +84,12 @@ ansi2knr: ansi2knr.o
$(LINK) ansi2knr.o $(LIBS)
install: all
- $(srcdir)/../mkinstalldirs $(bindir)
- $(INSTALL_PROGRAM) m4 $(bindir)/`echo m4 | sed '$(transform)'`
+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) m4 \
+ $(DESTDIR)$(bindir)/"`echo m4 | sed '$(transform)'`"
uninstall:
- rm -f $(bindir)/`echo m4 | sed '$(transform)'`
+ rm -f $(DESTDIR)$(bindir)/"`echo m4 | sed '$(transform)'`"
tags: TAGS
Index: checks/get-them
===================================================================
RCS file: /cvsroot/m4/m4/checks/Attic/get-them,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 get-them
--- checks/get-them 17 Feb 2000 03:03:19 -0000 1.1.1.1
+++ checks/get-them 31 Mar 2005 03:24:31 -0000
@@ -1,6 +1,6 @@
#!/bin/sh
# Extract all examples from the manual source.
-# Copyright (C) 1992 Free Software Foundation, Inc.
+# Copyright (C) 1992, 2005 Free Software Foundation, Inc.
# This script is for use with GNU awk.
@@ -59,6 +59,7 @@ BEGIN {
else
prefix = "";
gsub("@@", "@", $0);
+ gsub("@comment.*", "", $0);
printf("%s%s\n", prefix, $0) >> file;
}
- PING: 1.4.2a: failure in 47.patsubst,
Eric Blake <=