From: Dirk Mueller <daywalker@users.sourceforge.net>
Date: Sun, 1 Jun 2003 19:06:03 +0000 (+0000)
Subject: unbreak make regtest again
X-Git-Tag: svn/VALGRIND_2_0_0~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a392dfd92a5be6dbfa8a113f93d02eff8acd2e6;p=thirdparty%2Fvalgrind.git

unbreak make regtest again


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1661
---

diff --git a/coregrind/.cvsignore b/coregrind/.cvsignore
index 6378968c74..f70deef3bc 100644
--- a/coregrind/.cvsignore
+++ b/coregrind/.cvsignore
@@ -1,3 +1,4 @@
 Makefile.in
 Makefile
 valgrind
+.in_place
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 3f2a313398..b97fa14a1c 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -82,18 +82,16 @@ noinst_HEADERS = \
         vg_constants.h          \
 	vg_unsafe.h
 
-#### JRS 17 May 03, see comment below
-####MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) libpthread.so.0
-MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
+MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) .in_place/libpthread.so.0
 
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
 	$(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 
 vg_intercept.o vg_libpthread.o vg_replace_malloc.o: CFLAGS += -fno-omit-frame-pointer
 
-## Must have a libpthread.so.0 symlink
-#### JRS 17 May 03, this messes up the build system on many
-#### modern distros, since most build tools (make etc) are
-#### linked with libpthread.
-####libpthread.so.0:
-####	ln -s libpthread.so libpthread.so.0
+.in_place/libpthread.so.0:
+	mkdir -p .in_place
+	-rm -f .in_place/libpthread.so.0
+	-rm -f .in_place/valgrind.so
+	ln -f -s ../libpthread.so .in_place/libpthread.so.0
+	ln -f -s ../valgrind.so .in_place/valgrind.so
diff --git a/coregrind/valgrind.in b/coregrind/valgrind.in
index f7781c0400..bd1b8da454 100755
--- a/coregrind/valgrind.in
+++ b/coregrind/valgrind.in
@@ -80,7 +80,7 @@ fi
 if [ z"$in_place_arg" != z ]; then
    in_place_dir=`echo $in_place_arg | sed 's/--in-place=//'`
    skindir="$in_place_dir/$skin"
-   coredir="$in_place_dir/coregrind"
+   coredir="$in_place_dir/coregrind/.in_place"
    vgsupp="--suppressions=$in_place_dir/default.supp"
 fi