aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-15 21:15:32 -0700
committerJunio C Hamano <junkio@cox.net>2006-08-15 21:15:32 -0700
commitc9c3470aec3a1d753ac1e5f21358f6374c1add95 (patch)
tree32cfcecc5dfb4491eb054d9576f0db50fe058bbf /Makefile
parent6f002f984f1d1ddfdae990582a423dc5263697ae (diff)
parent53e1a761be8d338cd957870bc1e48a8c15d7d2c0 (diff)
downloadgit-c9c3470aec3a1d753ac1e5f21358f6374c1add95.tar.gz
git-c9c3470aec3a1d753ac1e5f21358f6374c1add95.tar.xz
Merge branch 'maint'
* maint: finish_connect(): thinkofix git-mv: succeed even if source is a prefix of destination Solaris does not support C99 format strings before version 10
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b86de761f..399d2333d 100644
--- a/Makefile
+++ b/Makefile
@@ -331,10 +331,12 @@ ifeq ($(uname_S),SunOS)
NEEDS_LIBICONV = YesPlease
NO_UNSETENV = YesPlease
NO_SETENV = YesPlease
+ NO_C99_FORMAT = YesPlease
endif
ifeq ($(uname_R),5.9)
NO_UNSETENV = YesPlease
NO_SETENV = YesPlease
+ NO_C99_FORMAT = YesPlease
endif
INSTALL = ginstall
TAR = gtar