summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2008-04-21 20:57:45 -0600
committerEric Blake <ebb9@byu.net>2008-04-21 20:57:45 -0600
commite6db1ee757abb49a7e739dc70a34dc8a14562e87 (patch)
tree8ef1929c72ebe6c1ae9fdabc591fbbdf195fd1a1
parent118acde8f302a12d6d11cd8fb63a79e221aaf8bb (diff)
downloadm4-e6db1ee757abb49a7e739dc70a34dc8a14562e87.tar.gz
Simplify previous patch.
* tests/m4.in: Compress assignment. Suggested by Gary V. Vaughan. Signed-off-by: Eric Blake <ebb9@byu.net>
-rw-r--r--ChangeLog4
-rw-r--r--tests/m4.in6
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index beb686b2..f53f91a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-04-21 Eric Blake <ebb9@byu.net>
+ Simplify previous patch.
+ * tests/m4.in: Compress assignment.
+ Suggested by Gary V. Vaughan.
+
Fix --disable-shared testsuite regression from previous patch.
* tests/m4.in: Export M4MODPATH, so that recursive m4 invocations
will also work.
diff --git a/tests/m4.in b/tests/m4.in
index afdeb182..34b96046 100644
--- a/tests/m4.in
+++ b/tests/m4.in
@@ -33,11 +33,7 @@ else
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
-if test "${M4MODPATH+set}" = set ; then
- M4MODPATH="@abs_top_builddir@/modules:$M4MODPATH"
-else
- M4MODPATH="@abs_top_builddir@/modules"
-fi
+M4MODPATH="@abs_top_builddir@/modules${M4MODPATH+:$M4MODPATH}"
export M4MODPATH
exec "@abs_top_builddir@/src/m4" ${1+"$@"}