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.

6 files changed, 6 insertions, 6 deletions

diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.in b/c/src/lib/libbsp/sh/gensh1/Makefile.in
index 372e8ad521..f30cdff386 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.in
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.in
@@ -22,6 +22,6 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 #  from the individual .rel files built in other directories
 SUB_DIRS = include startup scitab 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/sh/gensh1/include/Makefile.in b/c/src/lib/libbsp/sh/gensh1/include/Makefile.in
index 9ff68cd34f..46dd2a47bf 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/Makefile.in
+++ b/c/src/lib/libbsp/sh/gensh1/include/Makefile.in
@@ -46,6 +46,6 @@ all: preinstall
 preinstall: $(SRCS)
 	$(INSTALL_CHANGE) -m 644 $(H_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/sh/gensh1/scitab/Makefile.in b/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.in
index aa1ad333d8..5726834719 100644
--- a/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.in
+++ b/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.in
@@ -69,6 +69,6 @@ scitab.c: $(SHGEN)
 # 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/sh/gensh1/start/Makefile.in b/c/src/lib/libbsp/sh/gensh1/start/Makefile.in
index 22cb14b350..97193ee38b 100644
--- a/c/src/lib/libbsp/sh/gensh1/start/Makefile.in
+++ b/c/src/lib/libbsp/sh/gensh1/start/Makefile.in
@@ -65,6 +65,6 @@ CLOBBER_ADDITIONS +=
 all: ${ARCH} $(SRCS) $(OBJS) $(PGM)
 	$(INSTALL_VARIANT) -m 755 ${PGMS} $(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/sh/gensh1/startup/Makefile.in b/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in
index 5fb25c330e..6348d4786e 100644
--- a/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in
+++ b/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in
@@ -72,6 +72,6 @@ all: ${ARCH} $(SRCS) $(PGM)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 
-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/sh/gensh1/wrapup/Makefile.in b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.in
index 271996a9d8..0bce45776c 100644
--- a/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.in
@@ -69,6 +69,6 @@ install: all
 $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
 	$(INSTALL_DATA) $< $@
 
-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