diff options
author | Junio C Hamano <junkio@cox.net> | 2006-05-02 22:04:34 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-02 22:04:34 -0700 |
commit | fd9088a8c74a2d508ff50f53afbca93826603b30 (patch) | |
tree | b8211a4c19ec1659f52612cac6cb6881ca9c41d2 /Makefile | |
parent | Merge branch 'jc/grep' into next (diff) | |
parent | core.prefersymlinkrefs: use symlinks for .git/HEAD (diff) | |
download | tgif-fd9088a8c74a2d508ff50f53afbca93826603b30.tar.xz |
Merge branch 'jc/symref' into next
* jc/symref:
core.prefersymlinkrefs: use symlinks for .git/HEAD
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -28,8 +28,8 @@ all: # # Define NO_SETENV if you don't have setenv in the C library. # -# Define USE_SYMLINK_HEAD if you want .git/HEAD to be a symbolic link. -# Don't enable it on Windows. +# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link. +# Enable it on Windows. By default, symrefs are still used. # # Define PPC_SHA1 environment variable when running make to make use of # a bundled SHA1 routine optimized for PowerPC. @@ -265,6 +265,7 @@ ifeq ($(uname_O),Cygwin) NO_D_TYPE_IN_DIRENT = YesPlease NO_D_INO_IN_DIRENT = YesPlease NO_STRCASESTR = YesPlease + NO_SYMLINK_HEAD = YesPlease NEEDS_LIBICONV = YesPlease # There are conflicting reports about this. # On some boxes NO_MMAP is needed, and not so elsewhere. @@ -388,6 +389,9 @@ endif ifdef NO_D_INO_IN_DIRENT ALL_CFLAGS += -DNO_D_INO_IN_DIRENT endif +ifdef NO_SYMLINK_HEAD + ALL_CFLAGS += -DNO_SYMLINK_HEAD +endif ifdef NO_STRCASESTR COMPAT_CFLAGS += -DNO_STRCASESTR COMPAT_OBJS += compat/strcasestr.o |