summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-12 14:21:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-12 14:21:39 -0700
commite15f390b154a7d703ac62e4cc84bf720eda74e2c (patch)
treeedc6daeff81a1136ecc87616c54d396dc58eaf0a /Makefile
parentMerge git://ozlabs.org/~paulus/gitk (diff)
parentDocument MKDIR_WO_TRAILING_SLASH in Makefile (diff)
downloadtgif-e15f390b154a7d703ac62e4cc84bf720eda74e2c.tar.xz
Merge branch 'js/compat-mkdir'
Finishing touches to recently added wrapper for mkdir() that do not want to see trailing slashes. * js/compat-mkdir: Document MKDIR_WO_TRAILING_SLASH in Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 26b697d175..99157da2df 100644
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,8 @@ all::
#
# Define NO_MKDTEMP if you don't have mkdtemp in the C library.
#
+# Define MKDIR_WO_TRAILING_SLASH if your mkdir() can't deal with trailing slash.
+#
# Define NO_MKSTEMPS if you don't have mkstemps in the C library.
#
# Define NO_STRTOK_R if you don't have strtok_r in the C library.
@@ -1640,6 +1642,10 @@ ifdef NO_MKDTEMP
COMPAT_CFLAGS += -DNO_MKDTEMP
COMPAT_OBJS += compat/mkdtemp.o
endif
+ifdef MKDIR_WO_TRAILING_SLASH
+ COMPAT_CFLAGS += -DMKDIR_WO_TRAILING_SLASH
+ COMPAT_OBJS += compat/mkdir.o
+endif
ifdef NO_MKSTEMPS
COMPAT_CFLAGS += -DNO_MKSTEMPS
endif