Merge branch 'maint'

diff --git a/Makefile b/Makefile
index 52f2cc040ba82696b199537d3155a095939dac68..f64610a57bfea6176aa9f7d470b92014fe958432 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1241,7 +1241,6 @@ ifdef NO_MKDTEMP
 endif
 ifdef NO_MKSTEMPS
        COMPAT_CFLAGS += -DNO_MKSTEMPS
-       COMPAT_OBJS += compat/mkstemps.o
 endif
 ifdef NO_UNSETENV
        COMPAT_CFLAGS += -DNO_UNSETENV