summaryrefslogtreecommitdiff
path: root/Makerules
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 /Makerules
parentd41c6f6161ef2b500b68d7599fcbc6a4c4ca2285 (diff)
downloadglibc-ea97fc8e0b27e0ede8ca12f1f3f5c53cfbd43a81.tar.gz
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.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules4
1 files changed, 2 insertions, 2 deletions
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),';\