From 3c2e5a0e1d9197f06f0c9788ef6e4817aa5a677b Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Wed, 28 Nov 2018 00:48:45 -0700
Subject: [PATCH] More merge fixes for pucked builds.

Disable default plugins by default.
Restore debian-clean targets in {src,doc}/Makefile.in.
Punt -Werror.
---
 doc/Makefile.in            | 1 +
 src/Makefile.in            | 4 ++++
 src/configure.ac           | 4 ++--
 src/microcode/configure.ac | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index d3a6eee91..409c6bacb 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -129,6 +129,7 @@ install-info-gz install-info: $(PROJECT).info
 
 debian-clean:
 	rm -f $(DESTDIR)$(infodir)/dir*
+	rm -f $(DESTDIR)$(docdir)/plugins.scm
 
 $(PROJECT).info: $(PROJECT).info.in
 	sed -e 's|@SCMDOCDIR@|$(docdir)|g' < $< > $@
diff --git a/src/Makefile.in b/src/Makefile.in
index 74212d59a..22c8b2668 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -577,6 +577,10 @@ clean-boot-root:
 	rm -rf boot-root
 	rm -f stamp_*
 
+.PHONY: debian-clean
+debian-clean:
+	rm -f $(DESTDIR)$(AUXDIR)/plugins.scm
+
 .PHONY: tags TAGS
 tags TAGS:
 	$(top_srcdir)/Tags.sh $(SUBDIRS)
diff --git a/src/configure.ac b/src/configure.ac
index 1f62e6c2c..c0bfcc4cc 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -102,8 +102,8 @@ AC_ARG_WITH([scheme-build],
 
 AC_ARG_ENABLE([default-plugins],
     AS_HELP_STRING([--enable-default-plugins],
-	[Enable default plugins [[yes]]]))
-: ${enable_default_plugins=yes}
+	[Enable default plugins [[no]]]))
+: ${enable_default_plugins=no}
 
 AC_ARG_ENABLE([x11],
     AS_HELP_STRING([--enable-x11],
diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac
index 1384c49bd..fcee7f2ae 100644
--- a/src/microcode/configure.ac
+++ b/src/microcode/configure.ac
@@ -219,7 +219,7 @@ if test x"${GCC}" = xyes; then
 	CFLAGS="-O0 -g ${CFLAGS}"
 	LDFLAGS="${LDFLAGS} -g"
     fi
-    CFLAGS_WERROR=-Werror
+    dnl CFLAGS_WERROR=-Werror
 
     for flag in \
 	-frounding-math \
-- 
2.25.1