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.

9 files changed, 9 insertions, 9 deletions

diff --git a/c/src/lib/libbsp/no_cpu/Makefile.in b/c/src/lib/libbsp/no_cpu/Makefile.in
index ae84c16a22..a131814db5 100644
--- a/c/src/lib/libbsp/no_cpu/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/Makefile.in
@@ -21,6 +21,6 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 # Descend into the $(RTEMS_BSP_FAMILY) directory
 SUB_DIRS = $(RTEMS_BSP_FAMILY)
 
-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/lib/libbsp/no_cpu/no_bsp/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in
index 92ce7868e4..122cf99bd1 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in
@@ -30,6 +30,6 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
 #  from the individual .rel files built in other directories
 SUB_DIRS = include startup clock console $(MP_SUPPORT) timer wrapup
 
-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/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in
index 6648262ed7..77148fdb57 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in
@@ -65,6 +65,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install: all
 
-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/lib/libbsp/no_cpu/no_bsp/console/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in
index 82988b4264..305dcf8235 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in
@@ -65,6 +65,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install: all
 
-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/lib/libbsp/no_cpu/no_bsp/include/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in
index 4eddbeb436..abd6cf099e 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in
@@ -45,6 +45,6 @@ all: $(SRCS)
 	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
 	@$(INSTALL_CHANGE) -m 644 $(EQ_FILES) $(PROJECT_INCLUDE)
 
-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/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in
index a849162b92..585771a545 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in
@@ -65,6 +65,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install: all
 
-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/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in
index e131bf0497..d8d6143d00 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in
@@ -73,6 +73,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 install: all
 	$(INSTALL_CHANGE) linkcmds $(PROJECT_RELEASE)/lib
 
-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/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in
index 3aeaa49a91..484c90da67 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in
@@ -67,6 +67,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install: all
 
-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/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in
index 89b1a6006e..079e905f71 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in
@@ -63,6 +63,6 @@ $(LIB): ${OBJS}
 all: ${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-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