Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

    This one is an enhancement to acpolish.

    It replaces some Makefile variables by others variable in Makefile.ins
    (tries to use unique name for some variables). It therefore eases
    parsing Makefile.ins for further automatic Makefile.in conversions in
    future.

    To apply:
        cd <rtems-source-tree>
        sh <path-to>/rtems-rc-19990407-8.sh
        ./autogen

8 files changed, 8 insertions, 8 deletions

diff --git a/c/src/lib/libbsp/m68k/dmv152/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/Makefile.in
index 3c1c9be31a..ce36be0035 100644
--- a/c/src/lib/libbsp/m68k/dmv152/Makefile.in
+++ b/c/src/lib/libbsp/m68k/dmv152/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 # wrapup is the one that actually builds and installs the library
diff --git a/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in
index 40054fee5c..ddbcef2a87 100644
--- a/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in
+++ b/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in
@@ -27,7 +27,7 @@ H_FILES=
 SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/console/Makefile.in
index a8f3db24ab..1a2c30e5ac 100644
--- a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.in
+++ b/c/src/lib/libbsp/m68k/dmv152/console/Makefile.in
@@ -27,7 +27,7 @@ H_FILES=
 SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/lib/libbsp/m68k/dmv152/include/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/include/Makefile.in
index 538281d5dc..27b9e402ce 100644
--- a/c/src/lib/libbsp/m68k/dmv152/include/Makefile.in
+++ b/c/src/lib/libbsp/m68k/dmv152/include/Makefile.in
@@ -29,7 +29,7 @@ EQ_FILES =
 
 SRCS=$(H_FILES) $(EQ_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 CLEAN_ADDITIONS +=
diff --git a/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in
index f5065f6603..31a1bf67ff 100644
--- a/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in
+++ b/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in
@@ -27,7 +27,7 @@ H_FILES=
 SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in
index b3394ecacb..abe93f4134 100644
--- a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in
@@ -27,7 +27,7 @@ H_FILES=
 SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in
index c5f1e3ff8f..05a752b836 100644
--- a/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in
+++ b/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in
@@ -32,7 +32,7 @@ S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in
index 0705f8d13b..f2bd09c792 100644
--- a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in
@@ -23,7 +23,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
      $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB=$(ARCH)/libbsp.a
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #