aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-05-19 16:48:27 +0000
committerUlrich Drepper <drepper@redhat.com>2006-05-19 16:48:27 +0000
commitf50fa10c8ac99e0efdca8469c646a08dd2cdefe2 (patch)
tree1c304654d398805b0cbbdf0c7678345e1fde5551
parent882bfe73fd0d3ee9e625ff841bd0c1e0815cff90 (diff)
downloadglibc-f50fa10c8ac99e0efdca8469c646a08dd2cdefe2.tar
glibc-f50fa10c8ac99e0efdca8469c646a08dd2cdefe2.tar.gz
glibc-f50fa10c8ac99e0efdca8469c646a08dd2cdefe2.tar.bz2
glibc-f50fa10c8ac99e0efdca8469c646a08dd2cdefe2.zip
* 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.
-rw-r--r--ChangeLog8
-rw-r--r--debug/Makefile6
-rwxr-xr-xdebug/xtrace.sh4
-rw-r--r--malloc/Makefile7
-rwxr-xr-xmalloc/memusage.sh4
5 files changed, 21 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 944e6bcd6e..c135d0ad69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-05-19 Ulrich Drepper <drepper@redhat.com>
+ * 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.
+
* nis/nis_callback.c (__nis_create_callback): Calls to
svcudp_bufcreate and svctcp_create can fail. Free ->xprt if
asprintf call fails.
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.
diff --git a/malloc/Makefile b/malloc/Makefile
index c479da39b7..c39eae5474 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-1999, 2000, 2001, 2002, 2003, 2005
+# Copyright (C) 1991-1999, 2000, 2001, 2002, 2003, 2005, 2006
# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
@@ -79,6 +79,7 @@ endif
ifneq ($(cross-compiling),yes)
# If the gd library is available we build the `memusagestat' program.
ifneq ($(LIBGD),no)
+others: $(objpfx)memusage
install-bin = memusagestat
install-bin-script += memusage
generated += memusagestat memusage
@@ -126,6 +127,8 @@ tst-mcheck-ENV = MALLOC_CHECK_=3
# Uncomment this for test releases. For public releases it is too expensive.
#CPPFLAGS-malloc.o += -DMALLOC_DEBUG=1
+sLIBdir := $(shell echo $(slibdir) | sed 's,lib\(\|64\)$$,\\\\$$LIB,')
+
$(objpfx)mtrace: mtrace.pl
rm -f $@.new
sed -e 's|@PERL@|$(PERL)|' -e 's|@XXX@|$(address-width)|' \
@@ -135,7 +138,7 @@ $(objpfx)mtrace: mtrace.pl
$(objpfx)memusage: memusage.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 $@
diff --git a/malloc/memusage.sh b/malloc/memusage.sh
index 16413cf868..ecc935d037 100755
--- a/malloc/memusage.sh
+++ b/malloc/memusage.sh
@@ -18,8 +18,8 @@
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
-memusageso=@SLIBDIR@/libmemusage.so
-memusagestat=@BINDIR@/memusagestat
+memusageso='@SLIBDIR@/libmemusage.so'
+memusagestat='@BINDIR@/memusagestat'
TEXTDOMAIN=libc
# Print usage message.