From f50fa10c8ac99e0efdca8469c646a08dd2cdefe2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 19 May 2006 16:48:27 +0000 Subject: * malloc/memusage.sh (memusageso): Add quotes. (memusagestat): Likewise. * debug/xtrace.sh (pcprofileso): Likewise. (pcprofiledump): Likewise. * debug/Makefile ($(objpfx)xtrace): Use $LIB in SLIBDIR replacement. * malloc/Makefile ($(objpfx)memusage): Likewise. --- debug/Makefile | 6 ++++-- debug/xtrace.sh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debug') diff --git a/debug/Makefile b/debug/Makefile index 4b4b541ba7..9d9b6ac96a 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2004,2005 Free Software Foundation, Inc. +# Copyright (C) 1998-2001,2004,2005,2006 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -107,6 +107,8 @@ generated = catchsegv xtrace include ../Rules +sLIBdir := $(shell echo $(slibdir) | sed 's,lib\(\|64\)$$,\\\\$$LIB,') + $(objpfx)catchsegv: catchsegv.sh $(common-objpfx)soversions.mk \ $(common-objpfx)config.make slibpfx=`echo $(slibdir)|sed 's/lib\(64\|\)$$/\\\\\\\\$$LIB/'`; \ @@ -119,7 +121,7 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o $(objpfx)xtrace: xtrace.sh rm -f $@.new sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \ - -e 's|@SLIBDIR@|$(slibdir)|' -e 's|@BINDIR@|$(bindir)|' $^ > $@.new \ + -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' $^ > $@.new \ && rm -f $@ && mv $@.new $@ && chmod +x $@ # Depend on libc.so so a DT_NEEDED is generated in the shared objects. diff --git a/debug/xtrace.sh b/debug/xtrace.sh index 950ea5d207..082db3f349 100755 --- a/debug/xtrace.sh +++ b/debug/xtrace.sh @@ -18,8 +18,8 @@ # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # 02111-1307 USA. -pcprofileso=@SLIBDIR@/libpcprofile.so -pcprofiledump=@BINDIR@/pcprofiledump +pcprofileso='@SLIBDIR@/libpcprofile.so' +pcprofiledump='@BINDIR@/pcprofiledump' TEXTDOMAIN=libc # Print usage message. -- cgit 1.4.1