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/mvme167/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/Makefile.in
index 0671b462b1..19f294f63c 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/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/mvme167/clock/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/clock/Makefile.in
index 53d9354d7a..6225262018 100644
--- a/c/src/lib/libbsp/m68k/mvme167/clock/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/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/mvme167/console/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.in
index 099f5992ab..9761694265 100644
--- a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/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/mvme167/fatal/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.in
index 91084132b1..dda7477ef1 100644
--- a/c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/fatal/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/mvme167/include/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/include/Makefile.in
index 5389fda122..c8f68c803f 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/include/Makefile.in
@@ -30,7 +30,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/mvme167/startup/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/startup/Makefile.in
index f602443fd8..5378fb1f70 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/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/mvme167/timer/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/timer/Makefile.in
index 029ce81885..ed347125d7 100644
--- a/c/src/lib/libbsp/m68k/mvme167/timer/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/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/mvme167/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in
index 1c0baa2807..c9634d9605 100644
--- a/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in
@@ -34,7 +34,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
 
 #