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 71fe43fa935753ab142aa86ea13e772de08e6acd..b175915c01f3048afac41f3ffc3b108c189bbc3e 100644 (file)
--- 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 7573429b6bb28002920dee4d475650d1562b83ee..679d0d116ee2713153c0777cab68907b33c637d6 100644 (file)
--- 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 ce24a2d1db63a7baa2d5944b3210699a72421257..70e55f48e3e6780c08dbd69336f4ffcf0af79116 100644 (file)
--- 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 ed995ce60f432a8556b308503b003cba6d280a98..0a6f796584d0e3f0df2ce438f6702217d53a22f8 100644 (file)
--- 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 96d18a5cdb6cb87d4d2b5f891173db7bbf3761ee..1af596ba96f11ef92f83aaac1589813549d7dbee 100644 (file)
--- 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 3ad2cebe245f2d8b6c1bb2ce09bdb94a9cfecb39..8f710cd3d857c6c00ed067552312bbd3e5c037eb 100644 (file)
--- 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