summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-04-21 20:54:23 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-04-21 20:54:23 (GMT)
commit68e65e956017b4bd8c3e9decc13bcae93620d0cb (patch)
tree59b51e21c721478b993f090d9e768b38f625e1a6
parent28ace0ca83bb7e6503489592ed2988eb3e005c06 (diff)
parent74e554a8578e92b442ca760b6ca7de41140118c5 (diff)
downloadblt-68e65e956017b4bd8c3e9decc13bcae93620d0cb.zip
blt-68e65e956017b4bd8c3e9decc13bcae93620d0cb.tar.gz
blt-68e65e956017b4bd8c3e9decc13bcae93620d0cb.tar.bz2
Merge commit '74e554a8578e92b442ca760b6ca7de41140118c5'
-rw-r--r--tkmpeg/Makefile.in2
-rwxr-xr-xtkmpeg/configure1
-rw-r--r--tkmpeg/configure.ac1
3 files changed, 3 insertions, 1 deletions
diff --git a/tkmpeg/Makefile.in b/tkmpeg/Makefile.in
index d200a12..44ab3c0 100644
--- a/tkmpeg/Makefile.in
+++ b/tkmpeg/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 tkmpegConfig.sh
+CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
CLEANFILES = @CLEANFILES@
CPPFLAGS = @CPPFLAGS@
diff --git a/tkmpeg/configure b/tkmpeg/configure
index a873fdd..223b835 100755
--- a/tkmpeg/configure
+++ b/tkmpeg/configure
@@ -5754,6 +5754,7 @@ done
#--------------------------------------------------------------------
#CLEANFILES="$CLEANFILES pkgIndex.tcl"
+CLEANFILES="$CLEANFILES tkmpegConfig.sh"
if test "${TEA_PLATFORM}" = "windows" ; then
# Ensure no empty if clauses
:
diff --git a/tkmpeg/configure.ac b/tkmpeg/configure.ac
index 926cbbe..b5fa501 100644
--- a/tkmpeg/configure.ac
+++ b/tkmpeg/configure.ac
@@ -95,6 +95,7 @@ TEA_ADD_TCL_SOURCES([])
#--------------------------------------------------------------------
#CLEANFILES="$CLEANFILES pkgIndex.tcl"
+CLEANFILES="$CLEANFILES tkmpegConfig.sh"
if test "${TEA_PLATFORM}" = "windows" ; then
# Ensure no empty if clauses
: