Thu Oct 10 17:25:55 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
authorthomas <thomas>
Tue, 15 Oct 1996 15:06:39 +0000 (15:06 +0000)
committerthomas <thomas>
Tue, 15 Oct 1996 15:06:39 +0000 (15:06 +0000)
* 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.

Makerules

index 132165b..beb251f 100644 (file)
--- 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),';\