unbreak make regtest again

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

diff --git a/coregrind/.cvsignore b/coregrind/.cvsignore
index 6378968c749a8fad16b74cebeba73abe653133e4..f70deef3bc2a99924b363401f3c64ac081503337 100644 (file)
--- 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 3f2a31339800b0a74c647ad359300a17c667cf44..b97fa14a1cbbdc0f98b43f1ec199bf4579150193 100644 (file)
--- 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 f7781c040038128553ad311c7a85c5cbda3bcb1f..bd1b8da4541ad89aa726bde11e24d06b260b0c9d 100755 (executable)
--- 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