From a1e1d15b7347d84f8e816f2a483a0ae551a676de Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 15 May 2021 08:33:42 +0300 Subject: [PATCH 22/22] dependencies/*/Version: Rename as Version.txt Files named "Version" caused trouble on OSX build where system headers wanted to include a file named like that. Reported by Dean See osdn #42271 Signed-off-by: Marko Lindqvist --- dependencies/lua-5.3/Makefile.am | 2 +- dependencies/lua-5.3/{Version => Version.txt} | 0 dependencies/luasql/Makefile.am | 2 +- dependencies/luasql/{Version => Version.txt} | 0 dependencies/tolua-5.2/Makefile.am | 2 +- dependencies/tolua-5.2/{Version => Version.txt} | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename dependencies/lua-5.3/{Version => Version.txt} (100%) rename dependencies/luasql/{Version => Version.txt} (100%) rename dependencies/tolua-5.2/{Version => Version.txt} (100%) diff --git a/dependencies/lua-5.3/Makefile.am b/dependencies/lua-5.3/Makefile.am index dcad4f156f..e7ad67a990 100644 --- a/dependencies/lua-5.3/Makefile.am +++ b/dependencies/lua-5.3/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = src -EXTRA_DIST = Version \ +EXTRA_DIST = Version.txt \ freeciv_lua.patch \ doc/readme.html \ doc/logo.gif \ diff --git a/dependencies/lua-5.3/Version b/dependencies/lua-5.3/Version.txt similarity index 100% rename from dependencies/lua-5.3/Version rename to dependencies/lua-5.3/Version.txt diff --git a/dependencies/luasql/Makefile.am b/dependencies/luasql/Makefile.am index 558585f613..b919e47d08 100644 --- a/dependencies/luasql/Makefile.am +++ b/dependencies/luasql/Makefile.am @@ -4,4 +4,4 @@ SUBDIRS = src EXTRA_DIST = \ README \ - Version + Version.txt diff --git a/dependencies/luasql/Version b/dependencies/luasql/Version.txt similarity index 100% rename from dependencies/luasql/Version rename to dependencies/luasql/Version.txt diff --git a/dependencies/tolua-5.2/Makefile.am b/dependencies/tolua-5.2/Makefile.am index 28f28d6dbe..b08dab9e57 100644 --- a/dependencies/tolua-5.2/Makefile.am +++ b/dependencies/tolua-5.2/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = src EXTRA_DIST = README \ - Version \ + Version.txt \ freeciv_tolua.patch \ include/tolua.h diff --git a/dependencies/tolua-5.2/Version b/dependencies/tolua-5.2/Version.txt similarity index 100% rename from dependencies/tolua-5.2/Version rename to dependencies/tolua-5.2/Version.txt -- 2.30.2