From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 15 Dec 2004 18:44:54 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-glibc-20041215T2056~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8d8a2650ce753bcc162ccfa55f79a6967c21d06;p=thirdparty%2Fglibc.git

Update.

22004-06-05  Joseph S. Myers  <jsm@polyomino.org.uk>

	* malloc/Makefile (install-bin): Remove memusage.
	(install-bin-script): Add memusage.

004-12-15  Jakub Jelinek  <jakub@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 6bb97452e89..d2da9d1e7a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2004-12-15  Jakub Jelinek  <jakub@redhat.com>
+22004-06-05  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* malloc/Makefile (install-bin): Remove memusage.
+	(install-bin-script): Add memusage.
+
+004-12-15  Jakub Jelinek  <jakub@redhat.com>
 
 	* nis/nis_domain_of_r.c (nis_domain_of_r): Use libnsl_hidden_def,
 	not libnsl_hidden_proto.
diff --git a/malloc/Makefile b/malloc/Makefile
index 6c04518b39c..0512c498398 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -78,7 +78,8 @@ endif
 ifneq ($(cross-compiling),yes)
 # If the gd library is available we build the `memusagestat' program.
 ifneq ($(LIBGD),no)
-install-bin = memusagestat memusage
+install-bin = memusagestat
+install-bin-script += memusage
 generated += memusagestat memusage
 extra-objs += memusagestat.o