[前][次][番号順一覧][スレッド一覧]

ruby-changes:69624

From: Nobuyoshi <ko1@a...>
Date: Sun, 7 Nov 2021 22:37:19 +0900 (JST)
Subject: [ruby-changes:69624] ec032e86fa (master): [MinGW] Clear prefix and move the directory to DESTDIR

https://git.ruby-lang.org/ruby.git/commit/?id=ec032e86fa

From ec032e86faf9ac128ac51e3394d9b4001a374b38 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 7 Nov 2021 15:31:34 +0900
Subject: [MinGW] Clear prefix and move the directory to DESTDIR

Also the destination will be created at the installation.
---
 .github/workflows/mingw.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index d440c08c46a..0631718bb2e 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -74,7 +74,6 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L74
           }
       - name: misc setup, autoreconf
         run: |
-          mkdir install
           mkdir temp
           cd src
           sh -c "autoreconf -fi"
@@ -88,7 +87,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L87
           [Console]::InputEncoding  = [System.Text.Encoding]::GetEncoding("IBM437")
           $config_args = "--build=$env:CHOST --host=$env:CHOST --target=$env:CHOST"
           Write-Host $config_args
-          sh -c "../src/configure --disable-install-doc --prefix=/install $config_args"
+          sh -c "../src/configure --disable-install-doc --prefix=/. $config_args"
           # Write-Host "-------------------------------------- config.log"
           # Get-Content ./config.log | foreach {Write-Output $_}
 
@@ -113,7 +112,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L112
           $PSDefaultParameterValues['*:Encoding'] = 'utf8'
           [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437")
           [Console]::InputEncoding  = [System.Text.Encoding]::GetEncoding("IBM437")
-          make DESTDIR=.. install-nodoc
+          make DESTDIR=../install install-nodoc
 
       - name: test
         timeout-minutes: 5
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]