From e18254c3887e4451c432473874d471aeb43d4a0f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 2 Nov 2022 02:30:47 +0200 Subject: [PATCH 49/49] Rename installer_msys2/Makefile as Makefile.autotools See #45827 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 2 +- doc/README.msys2 | 2 +- fc_version | 2 +- windows/Makefile.am | 2 +- windows/installer_msys2/{Makefile => Makefile.autotools} | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename windows/installer_msys2/{Makefile => Makefile.autotools} (99%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f21856cc7c..b685e3e370 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: shell: msys2 {0} run: | cd windows/installer_msys2 - make ci && make -f Makefile.meson ci + make -f Makefile.autotools ci && make -f Makefile.meson ci os_x: runs-on: macos-12 steps: diff --git a/doc/README.msys2 b/doc/README.msys2 index 16fbbe0ef7..c623a85b9c 100644 --- a/doc/README.msys2 +++ b/doc/README.msys2 @@ -185,7 +185,7 @@ Get the freeciv sources there somehow. Some options are: is within msys2 > cd windows/installer_msys2 -> make +> make -f Makefile.autotools Target can be: - "all" (default), build all installers diff --git a/fc_version b/fc_version index c43158f3a2..9e5d8e22cd 100755 --- a/fc_version +++ b/fc_version @@ -39,7 +39,7 @@ VERSION_LABEL="-dev" # # 5) Final. # Update DEFAULT_FOLLOW_TAG to "stable", and also -# windows/installer_msys2/Makefile --with-followtag to "windows" +# windows/installer_msys2/Makefile.autotools --with-followtag to "windows" IS_DEVEL_VERSION=1 IS_FREEZE_VERSION=0 diff --git a/windows/Makefile.am b/windows/Makefile.am index 305f7ab80e..44540527ac 100644 --- a/windows/Makefile.am +++ b/windows/Makefile.am @@ -27,7 +27,7 @@ dist_noinst_DATA = \ installer_msys2/freeciv-server.cmd \ installer_msys2/freeciv-ruledit.cmd \ installer_msys2/Freeciv.url \ - installer_msys2/Makefile \ + installer_msys2/Makefile.autotools \ installer_msys2/Makefile.meson \ installer_msys2/cleanup_checkout.sh \ installer_cross/create-freeciv-gtk-qt-nsi.sh \ diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile.autotools similarity index 99% rename from windows/installer_msys2/Makefile rename to windows/installer_msys2/Makefile.autotools index d242990334..ad6ff29dfd 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile.autotools @@ -8,7 +8,7 @@ # Variable setup # -MAKEFILE_NAME=Makefile +MAKEFILE_NAME=Makefile.autotools ifeq ($(MSYSTEM),MINGW64) WINARCH=win64 -- 2.35.1