Changeset 0c618b67 in rtems

Timestamp:

Oct 7, 1997, 8:47:49 PM (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

f5afb69

Parents:

3a321e23

Message:

Redid the installation of the "make" directory at the install point.
It is no longer a link. It is a copy.

File:

• c/Makefile.in (modified) (3 diffs)

c/Makefile.in

@@ -29 +29 @@
 
 # We only make the install point for the KA9Q header files if it is enabled.
-LIBKA9Q_yes_V = include/ka9q
+LIBKA9Q_yes_V = lib/include/ka9q
 LIBKA9Q = $(LIBKA9Q_$(HAS_KA9Q)_V)
 
 # We only make the rtems++ install point if it is enabled.
-LIBRTEMSCPLUSPLUS_yes_V = include/rtems++
+LIBRTEMSCPLUSPLUS_yes_V = lib/include/rtems++
 LIBRTEMSCPLUSPLUS = $(LIBRTEMSCPLUSPLUS_$(HAS_CPLUSPLUS)_V)
 
 # directories to be created in install point
-CREATE_DIRS =   include include/sys \
-    include/rtems include/rtems/score include/rtems/rtems include/rtems/posix \
-    include/netinet include/libc include/libc/sys \
-    include/motorola include/zilog \
+CREATE_DIRS = \
+    lib lib/include lib/include/sys lib/include/rtems \
+    lib/include/rtems/score lib/include/rtems/rtems lib/include/rtems/posix \
+    lib/include/netinet lib/include/libc lib/include/libc/sys \
+    lib/include/motorola lib/include/zilog \
     $(LIBKA9Q) \
     $(LIBRTEMSCPLUSPLUS) \
-    lib bin samples \
+    bin samples \
     tests tests/screens tests/screens/sptests \
     tests/screens/psxtests tests/screens/mptests \
@@ -68 +69 @@
             (cd $(PROJECT_ROOT)/c/src/lib/libhwapi ; $(MAKE) mkdirs)
         -$(MKDIR) ${CREATE_DIRS:%=$(PROJECT_ROOT)/$(RTEMS_BSP)/%}
-        test -d $(PROJECT_ROOT)/$(RTEMS_BSP)/lib/include || \
-            ln -s $(PROJECT_ROOT)/$(RTEMS_BSP)/include \
-                $(PROJECT_ROOT)/$(RTEMS_BSP)/lib/include 
 
 distclean: clobber
@@ -90 +88 @@
          -$(MKDIR) $(prefix)/$(target)/rtems/make/os
         -rm -rf $(prefix)/$(target)/rtems/$(RTEMS_BSP)
-        cd ../; tar cf - $(RTEMS_BSP)/[bilsu]* | \
+        cd ../; tar cf - make $(RTEMS_BSP)/[bilsu]* | \
                 (cd $(prefix)/$(target)/rtems; tar xpBf - )
-        -rm -f $(prefix)/$(target)/rtems/$(RTEMS_BSP)/lib/include
-        ln -s $(prefix)/$(target)/rtems/$(RTEMS_BSP)/include \
-              $(prefix)/$(target)/rtems/$(RTEMS_BSP)/lib/include
-        cd $(srcdir); tar cf - make/compilers make/custom make/os \
-                make/leaf.cfg make/directory.cfg make/main.cfg | \
-                (cd $(prefix)/$(target)/rtems; tar xpBf - )
-        echo RTEMS_BSP = $(RTEMS_BSP) > \
-                $(prefix)/$(target)/rtems/$(RTEMS_BSP)/Makefile.inc
-        cat make/Templates/Makefile.inc >> \
-                $(prefix)/$(target)/rtems/$(RTEMS_BSP)/Makefile.inc
+        (echo RTEMS_BSP = $(RTEMS_BSP) ; cat make/Templates/Makefile.inc ) \
+                > $(prefix)/$(target)/rtems/$(RTEMS_BSP)/Makefile.inc
 
 tests: