about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--hurd/Makefile2
-rw-r--r--sysdeps/mach/getsysstats.c4
-rw-r--r--sysdeps/mach/hurd/Makefile4
4 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b538fa6096..7520d22587 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Sep 23 15:31:04 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* hurd/Makefile ($(includedir)/rpc/netdb.h): There is no make
+	variable `top_srcdir' in libc; use $(..) instead.
+
+	* sysdeps/mach/hurd/Makefile (rtld-installed-name): Delete special
+	definition.  It was a *Mistake*.  (With a capital M.)
+
+	* sysdeps/mach/getsysstats.c (__get_nprocs): Renamed from
+	__get_nproc.
+	(__get_nprocs_conf): Renamed from __get_nproc_conf.
+
 Sun Sep 22 15:18:41 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/unix/sysv/linux/init-first.c: Define dummy function
diff --git a/hurd/Makefile b/hurd/Makefile
index 363aeeaa98..bb63065383 100644
--- a/hurd/Makefile
+++ b/hurd/Makefile
@@ -73,7 +73,7 @@ include ../Rules
 # from $(subdirs), and this rule arranges for the header in question
 # to get installed.
 install-headers-nosubdir: $(includedir)/rpc/netdb.h
-$(includedir)/rpc/netdb.h: $(top_srcdir)/sunrpc/rpc/netdb.h
+$(includedir)/rpc/netdb.h: $(..)sunrpc/rpc/netdb.h
 	$(do-install)
 
 
diff --git a/sysdeps/mach/getsysstats.c b/sysdeps/mach/getsysstats.c
index cd72e734ae..4d1f671c78 100644
--- a/sysdeps/mach/getsysstats.c
+++ b/sysdeps/mach/getsysstats.c
@@ -25,7 +25,7 @@ Cambridge, MA 02139, USA.  */
 
 /* Return the number of processors configured on the system. */
 int
-__get_nproc_conf ()
+__get_nprocs_conf ()
 {
   struct host_basic_info hbi;
   kern_return_t err;
@@ -42,7 +42,7 @@ __get_nproc_conf ()
 
 /* Return the number of processors currently available on the system. */
 int
-__get_nproc ()
+__get_nprocs ()
 {
   struct host_basic_info hbi;
   kern_return_t err;
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index fa2f66ac5f..74ceb2e6e1 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -18,10 +18,6 @@
 
 ifdef in-Makerules
 
-# This should be in a more global place, because the problem it solves
-# is universal, but this is good enough for here.
-rtld-installed-name := ld.so$(libc.so-version)
-
 subdirs := $(filter-out sunrpc,$(subdirs)) # XXX skip broken dirs
 # See hurd/Makefile for commands that install some crucial sunrpc headers.