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/i386/ts_386ex/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/Makefile.in
index 29150201c2..90e6f8a8b6 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.in
@@ -26,6 +26,6 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
 #  from the individual .rel files built in other directories
 SUB_DIRS = include tools start startup clock console timer $(NETWORK) 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/i386/ts_386ex/clock/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.in
index 5a01e3e231..eab6caae01 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/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/i386/ts_386ex/console/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in
index f6c08a069e..9c4bbcd3a3 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in
@@ -69,6 +69,6 @@ all: ${ARCH} preinstall $(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/i386/ts_386ex/include/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in
index de0a2b14b1..9e2ee44c78 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in
@@ -51,6 +51,6 @@ all: $(SRCS)
 
 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/i386/ts_386ex/network/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in
index 49dc01d9a3..6e99d0ddb0 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in
@@ -61,6 +61,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/i386/ts_386ex/start/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in
index 5d9e857775..351d3111e3 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in
@@ -63,6 +63,6 @@ all: ${ARCH} $(SRCS) $(OBJS) $(PGM)
 # Install the program(s), appending _g or _p as appropriate.
 # for include files, just use $(INSTALL_CHANGE)
 
-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/i386/ts_386ex/startup/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in
index 8dc381b58f..a9239c3af9 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in
@@ -82,6 +82,6 @@ all: ${ARCH} preinstall $(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/i386/ts_386ex/timer/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.in
index 42651f536d..3422a474c2 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/timer/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/i386/ts_386ex/wrapup/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.in
index a22567a632..a7dd89c887 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.in
@@ -67,6 +67,6 @@ $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
 
 preinstall: $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs
 
-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