From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 21 Apr 2003 20:12:34 +0000 (-0400)
Subject: Use DYLD_LIBRAY_PATH so that "make check" works on
X-Git-Tag: E2FSPROGS-1_33~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afb6d709ba94cee1ab6b32c5f2f7acaa37c6845d;p=thirdparty%2Fe2fsprogs.git

Use DYLD_LIBRAY_PATH so that "make check" works on
	Darwin systems when building with shared libraries.
---

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 71fe43fa9..b175915c0 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-21  Theodore Ts'o  <tytso@mit.edu>
+
+	* Makefile.in: Use DYLD_LIBRAY_PATH so that "make check" works on
+		Darwin systems when building with shared libraries.
+
 2003-04-18  Theodore Ts'o  <tytso@mit.edu>
 
 	* unix_io.c: Use __CYGWIN__ instead of CYGWIN.
diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index 7573429b6..679d0d116 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -207,9 +207,9 @@ mkjournal: mkjournal.c $(STATIC_LIBEXT2FS)
 	$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
 
 check:: tst_badblocks tst_iscan @SWAPFS_CMT@ tst_byteswap
-	LD_LIBRARY_PATH=$(LIB) ./tst_badblocks
-	LD_LIBRARY_PATH=$(LIB) ./tst_iscan
-@SWAPFS_CMT@	LD_LIBRARY_PATH=$(LIB) ./tst_byteswap
+	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_badblocks
+	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_iscan
+@SWAPFS_CMT@	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_byteswap
 
 installdirs::
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \
diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index ce24a2d1d..70e55f48e 100644
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-21  Theodore Ts'o  <tytso@mit.edu>
+
+	* Makefile.in: Use DYLD_LIBRAY_PATH so that "make check" works on
+		Darwin systems when building with shared libraries.
+
 2003-04-12  Theodore Ts'o  <tytso@mit.edu>
 
 	* gen_uuid.c: Add #ifdef checks around #include <sys/ioctl.h> and
diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index ed995ce60..0a6f79658 100644
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -156,7 +156,7 @@ clean::
 	$(RM) -f ../libuuid.a ../libuuid_p.a tst_uuid uuid_time $(SMANPAGES)
 
 check:: tst_uuid
-	LD_LIBRARY_PATH=$(LIB) ./tst_uuid
+	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_uuid
 
 mostlyclean:: clean
 distclean:: clean
diff --git a/resize/ChangeLog b/resize/ChangeLog
index 96d18a5cd..1af596ba9 100644
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-21  Theodore Ts'o  <tytso@mit.edu>
+
+	* Makefile.in: Use DYLD_LIBRAY_PATH so that "make check" works on
+		Darwin systems when building with shared libraries.
+
 2003-03-06    <tytso@mit.edu>
 
 	* resize2fs.c (blocks_to_move): Bug fix; we were incorrectly
diff --git a/resize/Makefile.in b/resize/Makefile.in
index 3ad2cebe2..8f710cd3d 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -74,7 +74,7 @@ uninstall:
 	done
 
 test_extent.out: test_extent $(srcdir)/test_extent.in
-	LD_LIBRARY_PATH=$(LIB) ./test_extent < $(srcdir)/test_extent.in \
+	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./test_extent < $(srcdir)/test_extent.in \
 		> test_extent.out
 
 check:: test_extent.out