summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-08 20:42:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-09 00:19:28 (GMT)
commit1b1b678e3c4eebe0302455c248941e5627ce2b5b (patch)
treea1f54d7fafa896c3df1bfb454b24a2657084153e
parent424adc50b73f269ac3f3bd0195f9e7fea935109f (diff)
downloadgit-1b1b678e3c4eebe0302455c248941e5627ce2b5b.zip
git-1b1b678e3c4eebe0302455c248941e5627ce2b5b.tar.gz
git-1b1b678e3c4eebe0302455c248941e5627ce2b5b.tar.bz2
autoconf: clean temporary file mak.append
When configure is interrupted in the middle it leaves config.mak.append behind. Add it to .gitignore and make sure $(MAKE) clean removes it. Also earlier .gitignore listed config.mak.in which is a tracked file. Fix it. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--.gitignore2
-rw-r--r--Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index fb0fa3f..6e973b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,7 +140,7 @@ config.mak
autom4te.cache
config.log
config.status
-config.mak.in
config.mak.autogen
+config.mak.append
configure
git-blame
diff --git a/Makefile b/Makefile
index d8cc835..d4297c2 100644
--- a/Makefile
+++ b/Makefile
@@ -793,7 +793,7 @@ clean:
rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
rm -rf autom4te.cache
- rm -f config.log config.mak.autogen configure config.status config.cache
+ rm -f configure config.log config.mak.autogen config.mak.append config.status config.cache
rm -rf $(GIT_TARNAME) .doc-tmp-dir
rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
rm -f $(htmldocs).tar.gz $(manpages).tar.gz