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

13 files changed, 13 insertions, 13 deletions

diff --git a/c/src/exec/rtems/Makefile.in b/c/src/exec/rtems/Makefile.in
index 5195d4eb0f..4e814be59f 100644
--- a/c/src/exec/rtems/Makefile.in
+++ b/c/src/exec/rtems/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
 
 SUB_DIRS=include $(INLINE) optman src
diff --git a/c/src/exec/rtems/include/Makefile.in b/c/src/exec/rtems/include/Makefile.in
index f9f93de712..3fe8c3e185 100644
--- a/c/src/exec/rtems/include/Makefile.in
+++ b/c/src/exec/rtems/include/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
 
 SUB_DIRS=wrap rtems
diff --git a/c/src/exec/rtems/include/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/Makefile.in
index 31bf718fd1..537ef76931 100644
--- a/c/src/exec/rtems/include/rtems/Makefile.in
+++ b/c/src/exec/rtems/include/rtems/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
 
 SUB_DIRS=rtems
diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/rtems/Makefile.in
index bebbf5efcc..ac4298e659 100644
--- a/c/src/exec/rtems/include/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/include/rtems/rtems/Makefile.in
@@ -27,7 +27,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
 
 SRCS=$(H_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/exec/rtems/include/wrap/Makefile.in b/c/src/exec/rtems/include/wrap/Makefile.in
index 418e2eedc4..52857c7307 100644
--- a/c/src/exec/rtems/include/wrap/Makefile.in
+++ b/c/src/exec/rtems/include/wrap/Makefile.in
@@ -20,7 +20,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/../%.h)
 
 SRCS=$(H_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/exec/rtems/inline/Makefile.in b/c/src/exec/rtems/inline/Makefile.in
index 36005c76df..f3cd6c8507 100644
--- a/c/src/exec/rtems/inline/Makefile.in
+++ b/c/src/exec/rtems/inline/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
 
 SUB_DIRS=rtems
diff --git a/c/src/exec/rtems/inline/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/Makefile.in
index 9ce626f081..1e12c0ef05 100644
--- a/c/src/exec/rtems/inline/rtems/Makefile.in
+++ b/c/src/exec/rtems/inline/rtems/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
 
 SUB_DIRS=rtems
diff --git a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
index 6c5e59aa9d..f3b56f9330 100644
--- a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
@@ -21,7 +21,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 
 SRCS=$(I_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/exec/rtems/macros/Makefile.in b/c/src/exec/rtems/macros/Makefile.in
index 5b710120a6..5071720358 100644
--- a/c/src/exec/rtems/macros/Makefile.in
+++ b/c/src/exec/rtems/macros/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
 
 SUB_DIRS=rtems
diff --git a/c/src/exec/rtems/macros/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/Makefile.in
index 375f331adc..cb3b0ce2b5 100644
--- a/c/src/exec/rtems/macros/rtems/Makefile.in
+++ b/c/src/exec/rtems/macros/rtems/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
 
 SUB_DIRS=rtems
diff --git a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
index e988990899..6ff1b2bc9c 100644
--- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
@@ -21,7 +21,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 
 SRCS=$(I_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/exec/rtems/optman/Makefile.in b/c/src/exec/rtems/optman/Makefile.in
index c1d2f067c5..d47fccf0ac 100644
--- a/c/src/exec/rtems/optman/Makefile.in
+++ b/c/src/exec/rtems/optman/Makefile.in
@@ -27,7 +27,7 @@ OBJS=$(C_O_FILES) $(CC_O_FILES)
 
 PGMS=$(C_FILES:%.c=$(ARCH)/%.rel)
 
-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/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in
index ccfa585df9..990568c5b6 100644
--- a/c/src/exec/rtems/src/Makefile.in
+++ b/c/src/exec/rtems/src/Makefile.in
@@ -28,7 +28,7 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 SRCS=$(C_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/lib.cfg
 
 #