From 930ccb17ca6f556c823219505d5b3ad68bea4792 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Fri, 21 Apr 2017 16:55:20 -0400
Subject: Squashed 'tkhtml1/' changes from 64b934a5..1ea5a76a

1ea5a76a minor config change
b940b18d rm autom4te.cache ref

git-subtree-dir: tkhtml1
git-subtree-split: 1ea5a76aaeddbf82c2b3aaa3db1bebc9ba6af6ca
---
 Makefile.in  | 3 +--
 configure    | 1 +
 configure.ac | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index af69e8d..d0bd434 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -158,7 +158,7 @@ PKG_CFLAGS	= @PKG_CFLAGS@
 DEFS		= @DEFS@ $(PKG_CFLAGS)
 
 # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
-CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl tkhtml1Config.sh
+CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
 CLEANFILES	= @CLEANFILES@
 
 CPPFLAGS	= @CPPFLAGS@
@@ -360,7 +360,6 @@ distclean: clean
 	-rm -f *.tab.c
 	-rm -f $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log config.status
-	-rm -rf autom4te.cache
 
 #========================================================================
 # Install binary object libraries.  On Windows this includes both .dll and
diff --git a/configure b/configure
index 42a86f5..17789cc 100755
--- a/configure
+++ b/configure
@@ -5775,6 +5775,7 @@ src/htmltokens.c
 #--------------------------------------------------------------------
 
 #CLEANFILES="$CLEANFILES pkgIndex.tcl"
+CLEANFILES="$CLEANFILES tkhtml1Config.sh"
 if test "${TEA_PLATFORM}" = "windows" ; then
     # Ensure no empty if clauses
     :
diff --git a/configure.ac b/configure.ac
index ca8f0be..82d1623 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,7 @@ TEA_ADD_TCL_SOURCES([])
 #--------------------------------------------------------------------
 
 #CLEANFILES="$CLEANFILES pkgIndex.tcl"
+CLEANFILES="$CLEANFILES tkhtml1Config.sh"
 if test "${TEA_PLATFORM}" = "windows" ; then
     # Ensure no empty if clauses
     :
-- 
cgit v0.12