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

    A bug in acpolish made it into rtems-rc-19990709-0.diff, which
    unfortunately affects all Makefile.ins:

    * The maintainer mode conditional was erroniously applied to the
      dependencies of "Makefile".

    In case you already checked in rtems-rc-19990709-0.diff to CVS you have
    to check in all Makefile.ins again after applying the patch below :).

    Please apply the patch below as follows:

        patch -p1 < rtems-rc-19990709-1.diff
        tools/update/rtems-polish.sh -ac

    Note: There is no need to rerun your tests if you have used
    --enable-maintainer-mode to configure RTEMS, because this patch converts
    all Makefile.ins to the same settings as used for
    --enable-maintainer-mode.

11 files changed, 11 insertions, 11 deletions

diff --git a/c/src/tests/samples/Makefile.in b/c/src/tests/samples/Makefile.in
index a025017eec..a277743c55 100644
--- a/c/src/tests/samples/Makefile.in
+++ b/c/src/tests/samples/Makefile.in
@@ -35,6 +35,6 @@ FP_TESTS = paranoia
 SUB_DIRS = hello ticker base_sp unlimited minimum $(MP_TESTS) \
     $(CPLUSPLUS_TESTS) $(FP_TESTS)
 
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/tests/samples/base_mp/Makefile.in b/c/src/tests/samples/base_mp/Makefile.in
index f844aaeb3b..710c3f4d52 100644
--- a/c/src/tests/samples/base_mp/Makefile.in
+++ b/c/src/tests/samples/base_mp/Makefile.in
@@ -20,6 +20,6 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 
 SUB_DIRS = node1 node2
 
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/tests/samples/base_mp/node1/Makefile.in b/c/src/tests/samples/base_mp/node1/Makefile.in
index 271d1dd119..fd489d6ce0 100644
--- a/c/src/tests/samples/base_mp/node1/Makefile.in
+++ b/c/src/tests/samples/base_mp/node1/Makefile.in
@@ -69,6 +69,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/tests/samples/base_mp/node2/Makefile.in b/c/src/tests/samples/base_mp/node2/Makefile.in
index 5dad30c141..57297f33cc 100644
--- a/c/src/tests/samples/base_mp/node2/Makefile.in
+++ b/c/src/tests/samples/base_mp/node2/Makefile.in
@@ -69,6 +69,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/tests/samples/base_sp/Makefile.in b/c/src/tests/samples/base_sp/Makefile.in
index 10ae98901b..4d01dcc2d6 100644
--- a/c/src/tests/samples/base_sp/Makefile.in
+++ b/c/src/tests/samples/base_sp/Makefile.in
@@ -68,6 +68,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/tests/samples/cdtest/Makefile.in b/c/src/tests/samples/cdtest/Makefile.in
index e3279007bf..9dd4b05520 100644
--- a/c/src/tests/samples/cdtest/Makefile.in
+++ b/c/src/tests/samples/cdtest/Makefile.in
@@ -74,6 +74,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/tests/samples/hello/Makefile.in b/c/src/tests/samples/hello/Makefile.in
index da5323e23f..cc3397e694 100644
--- a/c/src/tests/samples/hello/Makefile.in
+++ b/c/src/tests/samples/hello/Makefile.in
@@ -70,6 +70,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/tests/samples/minimum/Makefile.in b/c/src/tests/samples/minimum/Makefile.in
index e6083d4b8d..5b2296091e 100644
--- a/c/src/tests/samples/minimum/Makefile.in
+++ b/c/src/tests/samples/minimum/Makefile.in
@@ -69,6 +69,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/tests/samples/paranoia/Makefile.in b/c/src/tests/samples/paranoia/Makefile.in
index 3393379f00..62d72e18c6 100644
--- a/c/src/tests/samples/paranoia/Makefile.in
+++ b/c/src/tests/samples/paranoia/Makefile.in
@@ -72,6 +72,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/tests/samples/ticker/Makefile.in b/c/src/tests/samples/ticker/Makefile.in
index 8e25a4a284..284043aa64 100644
--- a/c/src/tests/samples/ticker/Makefile.in
+++ b/c/src/tests/samples/ticker/Makefile.in
@@ -70,6 +70,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/tests/samples/unlimited/Makefile.in b/c/src/tests/samples/unlimited/Makefile.in
index d54cba7b49..7f816daaec 100644
--- a/c/src/tests/samples/unlimited/Makefile.in
+++ b/c/src/tests/samples/unlimited/Makefile.in
@@ -70,6 +70,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status