diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-05-21 22:00:48 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-05-21 22:00:48 +0000 |
| commit | 5a04a4228c17def8ccffb60c932fcfea7fdee7cd (patch) | |
| tree | c8bbf3d9f67de2e185041c1ccd611d692f858246 /malloc | |
| parent | 4cad81b6e72ed99c7816f28ad6828196b2ac7b65 (diff) | |
| download | glibc-5a04a4228c17def8ccffb60c932fcfea7fdee7cd.tar.gz glibc-5a04a4228c17def8ccffb60c932fcfea7fdee7cd.tar.xz glibc-5a04a4228c17def8ccffb60c932fcfea7fdee7cd.zip | |
Updated to fedora-glibc-20060521T2153 cvs/fedora-glibc-2_4_90-9
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/Makefile | 7 | ||||
| -rwxr-xr-x | malloc/memusage.sh | 4 |
2 files changed, 7 insertions, 4 deletions
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. |