summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-20 16:13:19 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-20 16:13:19 -0800
commitc0284cea3149cb20e24ee5e25b475e5f8edba84f (patch)
treec00aefb7e15c7130dc795fb63e81c7a5b194f19a /Makefile
parent9e7bd0110b41f9bb16377e322300629f8c4d6c12 (diff)
parentcba22528fa897728ebbffb95c05037ec9a20ea7c (diff)
downloadgit-c0284cea3149cb20e24ee5e25b475e5f8edba84f.tar.gz
Merge branch 'bc/fopen'
* bc/fopen: Add compat/fopen.c which returns NULL on attempt to open directory
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 83c359acde..d33a556ffe 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,9 @@ all::
# Define V=1 to have a more verbose compile.
#
+# Define FREAD_READS_DIRECTORIES if your are on a system which succeeds
+# when attempting to read from an fopen'ed directory.
+#
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
# This also implies MOZILLA_SHA1.
#
@@ -622,6 +625,10 @@ endif
ifdef NO_C99_FORMAT
BASIC_CFLAGS += -DNO_C99_FORMAT
endif
+ifdef FREAD_READS_DIRECTORIES
+ COMPAT_CFLAGS += -DFREAD_READS_DIRECTORIES
+ COMPAT_OBJS += compat/fopen.o
+endif
ifdef NO_SYMLINK_HEAD
BASIC_CFLAGS += -DNO_SYMLINK_HEAD
endif