From 6c8efc0dc724d3ec5120eb17e22bbfcbb7d6d1d9 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 23 Mar 2016 02:38:49 +0000 Subject: GNUmakefile.in: fix MSYS2_ARG_CONV_EXCL * cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL_PARAM): * add missing parentheses and remove double quotes. * rename to get rid of recursive references. * as --excludes-dir option is for a path name, its argument should be converted. [ruby-dev:49526] [Bug #12199] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ cygwin/GNUmakefile.in | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 848674d8ff..060e60c5e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Mar 23 11:38:47 2016 Nobuyoshi Nakada + + * cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL_PARAM): + * add missing parentheses and remove double quotes. + * rename to get rid of recursive references. + * as --excludes-dir option is for a path name, its argument + should be converted. + [ruby-dev:49526] [Bug #12199] + Wed Mar 23 10:39:38 2016 Koichi ITO * variable.c: Added documentation about order of `Module#constants` diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 678ff803ab..ebcc483f7e 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -89,11 +89,11 @@ $(OBJS) $(MAINOBJ): win32.h dir.$(OBJEXT) win32/win32.$(OBJEXT): win32/dir.h file.$(OBJEXT) win32/win32.$(OBJEXT): win32/file.h -MSYS2_ARG_CONV_EXCL=--exclude=;--excludes-dir=;--name= +MSYS2_ARG_CONV_EXCL_PARAM = --exclude=;--name= -yes-test-ruby: export MSYS2_ARG_CONV_EXCL="$MSYS2_ARG_CONV_EXCL" -yes-test-all: export MSYS2_ARG_CONV_EXCL="$MSYS2_ARG_CONV_EXCL" -yes-test-almost: export MSYS2_ARG_CONV_EXCL="$MSYS2_ARG_CONV_EXCL" +yes-test-ruby: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM) +yes-test-all: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM) +yes-test-almost: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM) endif -- cgit v1.2.3