From d5537f766c6727a0930dd79d3190878d0a135c94 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Wed, 6 Apr 2022 04:50:39 +0300
Subject: [PATCH 18/18] Rename --with-appdatadir as --with-metainfodir

See osdn #44096

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 client/Makefile.am        | 10 +++++-----
 configure.ac              |  8 ++++----
 doc/README.packaging      |  1 +
 server/Makefile.am        |  4 ++--
 tools/fcmp/Makefile.am    | 10 +++++-----
 tools/ruledit/Makefile.am |  4 ++--
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/client/Makefile.am b/client/Makefile.am
index 6dd8368cc8..b723092f29 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -4,16 +4,16 @@
 GUI_SUBDIRS =
 
 desktopfiledir = @DESKTOPDIR@
-appdatafiledir = @APPDATADIR@
+metainfofiledir = @METAINFODIR@
 
 desktopfile_DATA =
-appdatafile_DATA =
+metainfofile_DATA =
 
 if CLIENT_GUI_SDL2
 GUI_SUBDIRS += gui-sdl2
 desktopfile_DATA += \
 	org.freeciv.sdl2.desktop
-appdatafile_DATA += \
+metainfofile_DATA += \
 	freeciv-sdl2.appdata.xml
 endif
 if CLIENT_GUI_GTK_3_0
@@ -27,7 +27,7 @@ if CLIENT_GUI_GTK_3_22
 GUI_SUBDIRS += gui-gtk-3.22
 desktopfile_DATA += \
 	org.freeciv.gtk322.desktop
-appdatafile_DATA += \
+metainfofile_DATA += \
 	freeciv-gtk3.22.appdata.xml
 endif
 if CLIENT_GUI_GTK_4
@@ -37,7 +37,7 @@ if CLIENT_GUI_QT
 GUI_SUBDIRS += gui-qt
 desktopfile_DATA += \
 	org.freeciv.qt.desktop
-appdatafile_DATA += \
+metainfofile_DATA += \
 	freeciv-qt.appdata.xml
 endif
 if CLIENT_GUI_STUB
diff --git a/configure.ac b/configure.ac
index cfc46f53cd..6bd01835db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -384,10 +384,10 @@ AC_ARG_WITH([desktopdir],
 [ DESKTOPDIR=${withval} ], [ DESKTOPDIR="\$(prefix)/share/applications" ])
 AC_SUBST([DESKTOPDIR])
 
-AC_ARG_WITH([appdatadir],
-  AS_HELP_STRING([--with-appdatadir], [install appdata files to given dir]),
-[ APPDATADIR=${withval} ], [ APPDATADIR="\$(prefix)/share/metainfo" ])
-AC_SUBST([APPDATADIR])
+AC_ARG_WITH([metainfodir],
+  AS_HELP_STRING([--with-metainfodir], [install metainfo files to given dir]),
+[ METAINFODIR=${withval} ], [ METAINFODIR="\$(prefix)/share/metainfo" ])
+AC_SUBST([METAINFODIR])
 
 dnl try to support this development version's previous save games formats
 AC_ARG_ENABLE([dev-save-compat],
diff --git a/doc/README.packaging b/doc/README.packaging
index 6890351f1c..5165512674 100644
--- a/doc/README.packaging
+++ b/doc/README.packaging
@@ -37,6 +37,7 @@ Updating from 3.0 to 3.1
 * Minimum Qt5 requirement is 5.11.
 * Support for zstd compressed savegames added, requires libzstd and headers
 * Minimum Python requirement for code generation scripts is 3.4 now.
+* Configure option --with-appdatadir renamed as --with-metainfodir
 
 ----------------------------------------------------------------------
 Compatibility of modified versions
diff --git a/server/Makefile.am b/server/Makefile.am
index f6eb2d9e1d..4dd48782d3 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -184,6 +184,6 @@ desktopfiledir = @DESKTOPDIR@
 desktopfile_DATA = \
 	org.freeciv.server.desktop
 
-appdatafiledir = @APPDATADIR@
-appdatafile_DATA = \
+metainfofiledir = @METAINFODIR@
+metainfofile_DATA = \
 	freeciv-server.appdata.xml
diff --git a/tools/fcmp/Makefile.am b/tools/fcmp/Makefile.am
index 5502f39816..fef6ba4c76 100644
--- a/tools/fcmp/Makefile.am
+++ b/tools/fcmp/Makefile.am
@@ -43,27 +43,27 @@ else
 desktopfiledir = @DESKTOPDIR@
 desktopfile_DATA =
 
-appdatafiledir = @APPDATADIR@
-appdatafile_DATA =
+metainfofiledir = @METAINFODIR@
+metainfofile_DATA =
 
 if MODINST_GTK3
 desktopfile_DATA += \
 	org.freeciv.mp.gtk3.desktop
-appdatafile_DATA += \
+metainfofile_DATA += \
 	freeciv-mp-gtk3.appdata.xml
 endif
 
 if MODINST_GTK4
 desktopfile_DATA += \
 	org.freeciv.mp.gtk4.desktop
-appdatafile_DATA += \
+metainfofile_DATA += \
 	freeciv-mp-gtk4.appdata.xml
 endif
 
 if MODINST_QT
 desktopfile_DATA += \
 	org.freeciv.mp.qt.desktop
-appdatafile_DATA += \
+metainfofile_DATA += \
 	freeciv-mp-qt.appdata.xml
 endif
 
diff --git a/tools/ruledit/Makefile.am b/tools/ruledit/Makefile.am
index 477a324df1..a85f8c116e 100644
--- a/tools/ruledit/Makefile.am
+++ b/tools/ruledit/Makefile.am
@@ -10,8 +10,8 @@ endif
 desktopfiledir = @DESKTOPDIR@
 desktopfile_DATA = org.freeciv.ruledit.desktop
 
-appdatafiledir = @APPDATADIR@
-appdatafile_DATA = freeciv-ruledit.appdata.xml
+metainfofiledir = @METAINFODIR@
+metainfofile_DATA = freeciv-ruledit.appdata.xml
 
 bin_PROGRAMS = freeciv-ruledit
 
-- 
2.35.1