lib: move compat links from targetdirs to proper makefiles

@@ -43,10 +43,11 @@
 ROOTVARIANTDIR= $(ROOTLIB)/libc
 ROOTVARIANTDIR64=       $(ROOTLIB64)/libc
 
 # include common library definitions
 include ../Makefile.lib
+include ../Makefile.rootfs
 
 #
 # on some architectures, we build multiple libc variants
 #
 VAR1 =          hwcap1

@@ -90,11 +91,11 @@
 SUBDIRS=        $(MACH_CAP) $(MACH) $(MACH_ETC) $(VARIANT_SUBDIRS)
 $(BUILD64)SUBDIRS += $(MACH64) $(VARIANT_SUBDIRS64)
 
 LIBS =          $(DYNLIB)
 
-ROOTLIBS64=     $(ROOTLIBDIR64)/$(DYNLIB)
+ROOTLIBS64=     $(ROOTLIB64)/$(DYNLIB)
 MACHLIBS64=     $(MACH64)/$(DYNLIB)
 VARIANTLIBS=    $(VARIANTS:%=$(MACH)_%/$(VARBLD)/$(LIBBASENAME)_%.so.1)
 VARIANTLIBS64=  $(VARIANTS64:%=$(MACH)_%/$(VARBLD64)/$(LIBBASENAME)_%.so.1)
 ROOTVARIANTLIBS= $(VARIANTS:%=$(ROOTVARIANTDIR)/$(LIBBASENAME)_%.so.1)
 ROOTVARIANTLIBS64= $(VARIANTS64:%=$(ROOTVARIANTDIR64)/$(LIBBASENAME)_%.so.1)

@@ -108,12 +109,12 @@
 
 # install rules for install_h target
 $(ROOTHDRDIR)/%: port/gen/%
         $(INS.file)
 
-$(ROOTLIBDIR)/$(DYNLIB) :=      FILEMODE = 755
-$(ROOTLIBDIR64)/$(DYNLIB) :=    FILEMODE = 755
+$(ROOTLIB)/$(DYNLIB)    :=      FILEMODE = 755
+$(ROOTLIB64)/$(DYNLIB) :=       FILEMODE = 755
 $(ROOTFS_LIBDIR)/$(DYNLIB)      :=      FILEMODE = 755
 $(ROOTFS_LIBDIR64)/$(DYNLIB)    :=      FILEMODE = 755
 
 $(ROOTVARIANTDIR)                       := FILEMODE= 755
 $(ROOTVARIANTDIR)/$(VAR1_DYNLIB)        := FILEMODE= 755

@@ -163,11 +164,13 @@
         @cd $(@); pwd; $(MAKE) $(TARGET)
 
 install:        all                     \
                 etc                     \
                 inslib32                \
-                $(BUILD64) inslib64
+                $(ROOTCOMPATLINKS)
+
+$(BUILD64)install: inslib64 $(ROOTCOMPATLINKS64)
 
 inslib32:       $(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTVARIANTLIBS)
 
 inslib64:       $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) $(ROOTVARIANTLIBS64)
 

@@ -175,19 +178,10 @@
 
 all_h:  $(MACH)/assym.h $(MACH64)/assym.h
 
 check:  $(CHECKHDRS)
 
-$(ROOTFS_LIB)/%: $(MACH)/%
-        $(INS.file)
-$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS)
-        $(INS.liblink)
-$(ROOTFS_LIB64)/%: $(MACH64)/%
-        $(INS.file)
-$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS)
-        $(INS.liblink)
-
 $(ROOTVARIANTDIR): $(ROOTLIB)
         $(INS.dir)
 $(ROOTVARIANTDIR)/%: $(ROOTVARIANTDIR) $(VAR1_BLDDIR)/%
         $(INS.file)
 $(ROOTVARIANTDIR)/%: $(ROOTVARIANTDIR) $(VAR2_BLDDIR)/%

@@ -233,7 +227,8 @@
 
 cscope.out tags: FRC
         $(XREF) -x $@
 
 FRC:
+
 # include MACH-specific library targets
 include ../Makefile.mach