From 96f5eb0883f9fbe4f9176881dc832f183d00dcb7 Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Wed, 20 Jan 1999 22:12:51 +0000
Subject: [PATCH] * Makefile.am (@DIST_MAKEFILE_LIST@): work around Ultrix
 /bin/sh bug * tests/nomode.test (must specify a MODE): ditto Reported by
 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> * THANKS: Added Rainer Orth

---
 ChangeLog         | 7 +++++++
 Makefile.am       | 2 +-
 THANKS            | 1 +
 tests/nomode.test | 3 ++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d30609ba0..1f75775dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-01-20  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* Makefile.am (@DIST_MAKEFILE_LIST@): work around Ultrix /bin/sh bug
+	* tests/nomode.test (must specify a MODE): ditto
+	Reported by Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+	* THANKS: Added Rainer Orth
+
 1999-01-20  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* ltconfig.in: No known version of Solaris 2 hardcoded -L paths.
diff --git a/Makefile.am b/Makefile.am
index 684b5c113..161d14b11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,7 +75,7 @@ configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
 @DIST_MAKEFILE_LIST@:
 	dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
 	test -d $$dir || mkdir $$dir || exit 1; \
-	abs_srcdir=`cd $(top_srcdir) >/dev/null && pwd`; \
+	abs_srcdir=`cd $(top_srcdir) && pwd`; \
 	(cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1
 
 # Create and install libltdl.tar.gz
diff --git a/THANKS b/THANKS
index 302e509d7..ca618fb41 100644
--- a/THANKS
+++ b/THANKS
@@ -32,6 +32,7 @@ Mark Kettenis <kettenis@phys.uva.nl>
 Mimi Burbank <mimi@scri.fsu.edu>
 Oliver Guntermann <og@informatik.uni-hannover.de>
 Raffaele Sena <raff@aromatic.com>
+Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
 Ron O'Hara <rono@sentuny.com.au>
 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
 Stephan Kulow <coolo@kde.org>
diff --git a/tests/nomode.test b/tests/nomode.test
index ddc026dec..55c9cd246 100755
--- a/tests/nomode.test
+++ b/tests/nomode.test
@@ -17,7 +17,8 @@ else
   status=1
 fi
 
-if $libtool 2>&1 | grep 'you must specify a MODE' >/dev/null; then :
+# The emoticon below works around a nasty bug in Ultrix /bin/sh
+if ($libtool 2>&1; :) | grep 'you must specify a MODE' >/dev/null; then :
 else
   echo "invalid error when no mode is specified"
   status=1
-- 
2.47.2