On Tue, 13 Feb 2001 [EMAIL PROTECTED] wrote:
> On Tue, Feb 13, 2001 at 05:36:39PM +1000, Allan Rae wrote:
> > On Tue, 13 Feb 2001 [EMAIL PROTECTED] wrote:
> > > 1. Don't assume the system grep understands -E. Use egrep instead.
> >
> > Agreed. But do we really need egrep or is grep sufficient?
>
> I don't think grep works with '|'.
Please check out current CVS. Even if you just use cvsweb to get the
current po/Makefile.in.in or I can send it to you privately. There is
only one grep and one awk command in the entire Makefile now.
I suspect we can get by without the -E to grep and have just finished
testing here (GNU grep) and the attached patch works fine -- it's against
current CVS so you won't be able to test it against 1.1.6fix.
I would appreciate it if others could try this out to ensure standard
greps everywhere are happy with it.
> > > 2. Search for nawk-equivalent (awk cannot handle syntax in
> > > po/Makefile.in.in)
[...]
> > > - awk 'BEGIN {FS= ":"} {print $$1}' | \
> >
> > And here?
>
> This works fine. I thought I'd replace every awk with $(NAWK), even
> where not needed for consistency.
This is the only awk statement in the current Makefile so it should work
anywhere.
Allan. (ARRae)
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/ChangeLog,v
retrieving revision 1.56
diff -u -p -r1.56 ChangeLog
--- ChangeLog 2001/02/09 14:52:41 1.56
+++ ChangeLog 2001/02/14 00:57:26
@@ -1,3 +1,8 @@
+2001-02-14 Allan Rae <[EMAIL PROTECTED]>
+
+ * Makefile.in.in: grep -E isn't necessary (at least for GNU grep)
+ Needs wider testing.
+
2001-02-09 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* de.po: update from Pit
Index: Makefile.in.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/Makefile.in.in,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.in.in
--- Makefile.in.in 2001/01/14 04:43:42 1.11
+++ Makefile.in.in 2001/02/14 00:57:27
@@ -232,7 +232,7 @@ update-po: Makefile
${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS)
rm -f $@-t \
&& ( cd $(top_srcdir); \
- grep -l -E "_\(\".*\"\)" `find src -name \*.[hHC]` | \
+ grep -l "_(\".*\")" `find src -name \*.[hHC]` | \
awk 'BEGIN {FS= ":"} {print $$1}' | \
sed -e '/xforms.forms/d' | \
sort -f -d | uniq ) > $@-t \
