summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-16 08:22:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-16 08:22:10 (GMT)
commit5bd148bfe8a4f2df8487e029cd4ee6809bc4c963 (patch)
tree1960d9d9011cb728631b357c928745b42d096eda /Makefile
parentc5f71ad09994b46d80878ce72d1ca6f59935d952 (diff)
parentc7c84859ad586ae5670224e1abc4f846f7c3a9ae (diff)
downloadgit-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.zip
git-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.tar.gz
git-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.tar.bz2
Merge branch 'maint' to sync with GIT 1.5.2.2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 11 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a70277b..c09dfaf 100644
--- a/Makefile
+++ b/Makefile
@@ -107,6 +107,8 @@ all::
# Define USE_STDEV below if you want git to care about the underlying device
# change being considered an inode change from the update-cache perspective.
#
+# Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
+#
# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
# MakeMaker (e.g. using ActiveState under Cygwin).
#
@@ -410,6 +412,7 @@ ifeq ($(uname_S),SunOS)
NEEDS_NSL = YesPlease
SHELL_PATH = /bin/bash
NO_STRCASESTR = YesPlease
+ NO_HSTRERROR = YesPlease
ifeq ($(uname_R),5.8)
NEEDS_LIBICONV = YesPlease
NO_UNSETENV = YesPlease
@@ -654,6 +657,10 @@ endif
ifdef NO_PERL_MAKEMAKER
export NO_PERL_MAKEMAKER
endif
+ifdef NO_HSTRERROR
+ COMPAT_CFLAGS += -DNO_HSTRERROR
+ COMPAT_OBJS += compat/hstrerror.o
+endif
ifeq ($(TCLTK_PATH),)
NO_TCLTK=NoThanks
@@ -684,6 +691,10 @@ ifndef V
endif
endif
+ifdef ASCIIDOC8
+ export ASCIIDOC8
+endif
+
# Shell quote (do not use $(call) to accommodate ancient setups);
SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))