aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-30 13:24:29 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-30 13:24:29 -0700
commit2dcb927f37976ef5185cef5452516b170b14cd6c (patch)
tree7cf8212645ab4bde2fccbdb0830c0dc51ed6005b /Makefile
parent818f477c40fee62ab8ea5b493c51bb357f38957c (diff)
parent2d023581c9a0ae5efdebfd0084d54d09669a25d5 (diff)
downloadgit-2dcb927f37976ef5185cef5452516b170b14cd6c.tar.gz
git-2dcb927f37976ef5185cef5452516b170b14cd6c.tar.xz
Merge branch 'jn/make'
* jn/make: Set datarootdir in config.mak.in Quote all calls to GIT_CONF_APPEND_LINE Typofix in configure.ac comment. configure.ac vertical whitespace usage cleanup autoconf: Checks for some programs autoconf: Checks for libraries autoconf: Checks for some library functions. autoconf: Checks for typedefs, structures, and compiler characteristics. autoconf: Preparing the way for autodetection Copy description of build configuration variables to configure.ac Teach make clean about configure and autoconf autoconf: Use autoconf to write installation directories to config.mak.autogen
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 8349e3def..814c5642e 100644
--- a/Makefile
+++ b/Makefile
@@ -352,6 +352,7 @@ ifneq (,$(findstring arm,$(uname_M)))
ARM_SHA1 = YesPlease
endif
+-include config.mak.autogen
-include config.mak
ifdef WITH_OWN_SUBPROCESS_PY
@@ -771,6 +772,8 @@ clean:
$(LIB_FILE) $(XDIFF_LIB)
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 -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