From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 13 Jul 2008 19:41:35 +0000 (-0400)
Subject: e2fsck: Set LD_LIBRARY_PATH before running "make check" programs
X-Git-Tag: v1.41.1~131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ceebf84fbd5514a4b8abebc7d0e749bb3e8f5c19;p=thirdparty%2Fe2fsprogs.git

e2fsck: Set LD_LIBRARY_PATH before running "make check" programs

This is needed so that "make check" works in the e2fsck library even
if the shared libraries are not yet installed, and so that we run
those programs against the version of the libraries built in the build
tree.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 9b32a610d..a65417522 100644
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -138,7 +138,7 @@ crc32table.h: gen_crc32table
 
 tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS)
 	@$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
-		-DUNITTEST $(LIBEXT2FS)
+		-DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR)
 
 tst_refcount: ea_refcount.c
 	@echo "	LD $@"
@@ -151,9 +151,9 @@ tst_region: region.c
 		$(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)
 
 check:: tst_refcount tst_region tst_crc32
-	./tst_refcount
-	./tst_region
-	./tst_crc32
+	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_refcount
+	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_region
+	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_crc32
 
 extend: extend.o
 	@echo "	LD $@"