From 7dffbcf05196047c424e81ffb5dfa05e4cff6af3 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 27 May 2023 01:10:04 +0300 Subject: [PATCH 18/18] msys2: Rename "Output" as "output" See osdn #48041 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile.autotools | 2 +- windows/installer_msys2/Makefile.meson | 2 +- windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh | 2 +- windows/installer_msys2/create-freeciv-gtk3.22-nsi.sh | 2 +- windows/installer_msys2/create-freeciv-gtk4-nsi.sh | 2 +- windows/installer_msys2/create-freeciv-qt5-nsi.sh | 2 +- windows/installer_msys2/create-freeciv-qt6-nsi.sh | 2 +- windows/installer_msys2/create-freeciv-ruledit-nsi.sh | 2 +- windows/installer_msys2/create-freeciv-sdl2-nsi.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools index 59a7822fe4..197cd1f08a 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -9,7 +9,7 @@ # MAKEFILE_NAME=Makefile.autotools -OUT_DIR=autotools/Output +OUT_DIR=autotools/output BUILD_DIR=autotools/build INST_DIR=autotools/install NSI_DIR=autotools/nsi diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index b64a796b4a..02f2a4aa42 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -10,7 +10,7 @@ # MAKEFILE_NAME=Makefile.meson -OUT_DIR=meson/Output +OUT_DIR=meson/output BUILD_DIR=meson/build INST_DIR=meson/install NSI_DIR=meson/nsi diff --git a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh b/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh index ce0ebba597..034a485c2e 100644 --- a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh +++ b/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh @@ -1,6 +1,6 @@ #!/bin/sh -# ./create-freeciv-gtk-qt-nsi.sh [mp gui] [exe id] +# ./create-freeciv-gtk-qt-nsi.sh [mp gui] [exe id] if test "x$8" != "x" ; then EXE_ID="$8" diff --git a/windows/installer_msys2/create-freeciv-gtk3.22-nsi.sh b/windows/installer_msys2/create-freeciv-gtk3.22-nsi.sh index f62924e8b1..6370f74cc7 100644 --- a/windows/installer_msys2/create-freeciv-gtk3.22-nsi.sh +++ b/windows/installer_msys2/create-freeciv-gtk3.22-nsi.sh @@ -1,5 +1,5 @@ #!/bin/sh -# ./create-freeciv-gtk3.22-nsi.sh +# ./create-freeciv-gtk3.22-nsi.sh ./create-freeciv-gtk-qt-nsi.sh "$1" "$2" "$3" "gtk3.22" "GTK+3.22" "$4" "gtk3" diff --git a/windows/installer_msys2/create-freeciv-gtk4-nsi.sh b/windows/installer_msys2/create-freeciv-gtk4-nsi.sh index 20ad180f37..d198cea12e 100644 --- a/windows/installer_msys2/create-freeciv-gtk4-nsi.sh +++ b/windows/installer_msys2/create-freeciv-gtk4-nsi.sh @@ -1,5 +1,5 @@ #!/bin/sh -# ./create-freeciv-gtk4-nsi.sh +# ./create-freeciv-gtk4-nsi.sh ./create-freeciv-gtk-qt-nsi.sh "$1" "$2" "$3" "gtk4" "GTK4" "$4" "gtk4" diff --git a/windows/installer_msys2/create-freeciv-qt5-nsi.sh b/windows/installer_msys2/create-freeciv-qt5-nsi.sh index d10de062ab..bf806ed313 100644 --- a/windows/installer_msys2/create-freeciv-qt5-nsi.sh +++ b/windows/installer_msys2/create-freeciv-qt5-nsi.sh @@ -1,5 +1,5 @@ #!/bin/sh -# ./create-freeciv-qt-nsi.sh +# ./create-freeciv-qt-nsi.sh ./create-freeciv-gtk-qt-nsi.sh "$1" "$2" "$3" "qt5" "Qt5" "$4" "" "qt" diff --git a/windows/installer_msys2/create-freeciv-qt6-nsi.sh b/windows/installer_msys2/create-freeciv-qt6-nsi.sh index 8ec37626de..ced661a6d2 100644 --- a/windows/installer_msys2/create-freeciv-qt6-nsi.sh +++ b/windows/installer_msys2/create-freeciv-qt6-nsi.sh @@ -1,5 +1,5 @@ #!/bin/sh -# ./create-freeciv-qt-nsi.sh +# ./create-freeciv-qt-nsi.sh ./create-freeciv-gtk-qt-nsi.sh "$1" "$2" "$3" "qt6" "Qt6" "$4" "" "qt" diff --git a/windows/installer_msys2/create-freeciv-ruledit-nsi.sh b/windows/installer_msys2/create-freeciv-ruledit-nsi.sh index bdb64f6f8a..28191ed20e 100644 --- a/windows/installer_msys2/create-freeciv-ruledit-nsi.sh +++ b/windows/installer_msys2/create-freeciv-ruledit-nsi.sh @@ -1,6 +1,6 @@ #!/bin/sh -# ./create-freeciv-ruledit.sh +# ./create-freeciv-ruledit.sh ARCH_KEY_PART="$4" if test "$4" != "win32" && test "$4" != "win64" ; then diff --git a/windows/installer_msys2/create-freeciv-sdl2-nsi.sh b/windows/installer_msys2/create-freeciv-sdl2-nsi.sh index b2f6c05c81..790f41a3f1 100644 --- a/windows/installer_msys2/create-freeciv-sdl2-nsi.sh +++ b/windows/installer_msys2/create-freeciv-sdl2-nsi.sh @@ -1,6 +1,6 @@ #!/bin/sh -# ./create-freeciv-sdl2-nsi.sh +# ./create-freeciv-sdl2-nsi.sh ARCH_KEY_PART="$4" if test "$4" != "win32" && test "$4" != "win64" ; then -- 2.39.2