summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Bushnell, BSG <thomas@gnu.org>1996-10-15 15:06:39 +0000
committerThomas Bushnell, BSG <thomas@gnu.org>1996-10-15 15:06:39 +0000
commitea97fc8e0b27e0ede8ca12f1f3f5c53cfbd43a81 (patch)
treedcf7c3e22d8285e03a9aa1738413288e3b07e2ac
parentd41c6f6161ef2b500b68d7599fcbc6a4c4ca2285 (diff)
downloadglibc-ea97fc8e0b27e0ede8ca12f1f3f5c53cfbd43a81.tar.gz
glibc-ea97fc8e0b27e0ede8ca12f1f3f5c53cfbd43a81.tar.xz
glibc-ea97fc8e0b27e0ede8ca12f1f3f5c53cfbd43a81.zip
Thu Oct 10 17:25:55 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
	* Makerules (sysd-Makefile): Look for sysdep Makefiles using $(..)
	so that it still works right if we happen to get called in a
	subdir it still works.
Thu Oct 10 17:25:55 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* Makerules (sysd-Makefile): Look for sysdep Makefiles using $(..)
	so that it still works right if we happen to get called in a
	subdir it still works.

	* sysdeps/mach/hurd/fcntlbits.h (O_SHLOCK, O_EXLOCK): Redesignate
	as file name translation flags.
	* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): Don't pretend
	to do anything for O_SHLOCK or O_EXLOCK.  Those are now file name
	translation flags.
	
	* Makerules ($(libdir)/libc.so): Mention the actual libc.a archive
	name (changed according to libc-name) to avoid getting the
	Hurd-ish linker script for libc.a when we only want the archive
	library. 
-rw-r--r--ChangeLog17
-rw-r--r--Makerules4
2 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e5ec98cc7..5c8c938786 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -184,6 +184,23 @@ Thu Oct 10 14:00:01 1996  Ulrich Drepper  <drepper@cygnus.com>
 	* sysdeps/libm-ieee754/w_log10.c: Fix typo in weak_alias.
 	Reported by Matthew Jacob <mjacob@feral.com>.
 
+Thu Oct 10 17:25:55 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* Makerules (sysd-Makefile): Look for sysdep Makefiles using $(..)
+	so that it still works right if we happen to get called in a
+	subdir it still works.
+
+	* sysdeps/mach/hurd/fcntlbits.h (O_SHLOCK, O_EXLOCK): Redesignate
+	as file name translation flags.
+	* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): Don't pretend
+	to do anything for O_SHLOCK or O_EXLOCK.  Those are now file name
+	translation flags.
+	
+	* Makerules ($(libdir)/libc.so): Mention the actual libc.a archive
+	name (changed according to libc-name) to avoid getting the
+	Hurd-ish linker script for libc.a when we only want the archive
+	library. 
+
 Wed Oct  9 00:24:52 1996  Jim Meyering  <meyering@asic.sc.ti.com>
 
 	* time/strftime.c: Allow old K&R compilers compile this file.
diff --git a/Makerules b/Makerules
index 132165bb38..beb251f560 100644
--- a/Makerules
+++ b/Makerules
@@ -104,7 +104,7 @@ $(+sysdir_pfx)sysd-Makefile: $(+sysdir_pfx)config.make $(..)Makerules \
 	(echo 'sysd-Makefile-sysdirs := $(config-sysdirs)';		      \
 	 for dir in $(config-sysdirs); do	   			      \
 	   file=$$dir/Makefile;						      \
-	   if [ -f $$file ]; then					      \
+	   if [ -f $(..)$$file ]; then					      \
 	     case $$dir in						      \
 	       /*) echo include "$$file" ;;				      \
 	       *)  echo include "\$$(..)$$file" ;;			      \
@@ -617,7 +617,7 @@ ifndef subdir
 install: $(libdir)/libc.so
 $(libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \
 		   $(elfobjdir)/$(rtld-installed-name) \
-		   $(common-objpfx)libc.a
+		   $(libdir)lib$(libc-name).a
 	(echo '/* Use the shared library, but some functions are only in';\
 	 echo '   the static library, so try that secondarily.'; \
 	 echo '   The dynamic linker defines some functions used by $(<F),';\