[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113069: Tweak regexp in previous doc/*/Makefile.in
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r113069: Tweak regexp in previous doc/*/Makefile.in change, make error fatal |
Date: |
Wed, 19 Jun 2013 06:41:43 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113069
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-18 23:41:37 -0700
message:
Tweak regexp in previous doc/*/Makefile.in change, make error fatal
modified:
doc/emacs/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-6228
doc/lispintro/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-6130
doc/lispref/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-6156
=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in 2013-06-19 03:49:26 +0000
+++ b/doc/emacs/Makefile.in 2013-06-19 06:41:37 +0000
@@ -201,9 +201,10 @@
-e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
+ @if grep '@[a-zA-Z_]*@' emacs-manual-${version}/Makefile; then \
+ echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+ fi
tar -cf emacs-manual-${version}.tar emacs-manual-${version}
- @grep '@[A-Z]*@' emacs-manual-${version}/Makefile && \
- echo "WARNING: Unexpanded configure variables in Makefile?" || true
rm -rf emacs-manual-${version}
### Makefile ends here
=== modified file 'doc/lispintro/Makefile.in'
--- a/doc/lispintro/Makefile.in 2013-06-19 03:49:26 +0000
+++ b/doc/lispintro/Makefile.in 2013-06-19 06:41:37 +0000
@@ -112,9 +112,10 @@
-e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile
+ @if grep '@[a-zA-Z_]*@' emacs-lispintro-${version}/Makefile; then \
+ echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+ fi
tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
- @grep '@[A-Z]*@' emacs-lispintro-${version}/Makefile && \
- echo "WARNING: Unexpanded configure variables in Makefile?" || true
rm -rf emacs-lispintro-${version}
### Makefile ends here
=== modified file 'doc/lispref/Makefile.in'
--- a/doc/lispref/Makefile.in 2013-06-19 03:49:26 +0000
+++ b/doc/lispref/Makefile.in 2013-06-19 06:41:37 +0000
@@ -169,9 +169,10 @@
-e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
+ @if grep '@[a-zA-Z_]*@' emacs-lispref-${version}/Makefile; then \
+ echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+ fi
tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
- @grep '@[A-Z]*@' emacs-lispref-${version}/Makefile && \
- echo "WARNING: Unexpanded configure variables in Makefile?" || true
rm -rf emacs-lispref-${version}
### Makefile ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113069: Tweak regexp in previous doc/*/Makefile.in change, make error fatal,
Glenn Morris <=