From a9cbb431295e32224d3767870b9b7480d263c74b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 22 Mar 2021 16:18:19 +0200 Subject: [PATCH 15/15] Alien: Install nation ruleset files to correct directory Reported anonymously See osdn #41828 Signed-off-by: Marko Lindqvist --- configure.ac | 1 + data/alien/Makefile.am | 13 +++---------- data/alien/nation/Makefile.am | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 data/alien/nation/Makefile.am diff --git a/configure.ac b/configure.ac index ebb14554db..2c75390173 100644 --- a/configure.ac +++ b/configure.ac @@ -1681,6 +1681,7 @@ AC_CONFIG_FILES([Makefile data/sandbox/Makefile data/experimental/Makefile data/alien/Makefile + data/alien/nation/Makefile data/civ2civ3/Makefile data/civ1/Makefile data/civ2/Makefile diff --git a/data/alien/Makefile.am b/data/alien/Makefile.am index ba9e58166a..2baaf1a714 100644 --- a/data/alien/Makefile.am +++ b/data/alien/Makefile.am @@ -3,6 +3,8 @@ ## Override automake so that "make install" puts these in proper place: pkgdatadir = $(datadir)/$(PACKAGE)/alien +SUBDIRS = nation + pkgdata_DATA = \ buildings.ruleset \ cities.ruleset \ @@ -16,15 +18,6 @@ pkgdata_DATA = \ techs.ruleset \ terrain.ruleset \ units.ruleset \ - README.alien \ - nation/adventurers.ruleset \ - nation/galacticsound.ruleset \ - nation/jw.ruleset \ - nation/kindergarden.ruleset \ - nation/lunatics.ruleset \ - nation/madmen.ruleset \ - nation/mathclub.ruleset \ - nation/secretsociety.ruleset \ - nation/teamgladiators.ruleset + README.alien EXTRA_DIST = $(pkgdata_DATA) diff --git a/data/alien/nation/Makefile.am b/data/alien/nation/Makefile.am new file mode 100644 index 0000000000..66f27d0751 --- /dev/null +++ b/data/alien/nation/Makefile.am @@ -0,0 +1,17 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/alien/nation + +pkgdata_DATA = \ + adventurers.ruleset \ + galacticsound.ruleset \ + jw.ruleset \ + kindergarden.ruleset \ + lunatics.ruleset \ + madmen.ruleset \ + mathclub.ruleset \ + secretsociety.ruleset \ + teamgladiators.ruleset + +EXTRA_DIST = $(pkgdata_DATA) -- 2.30.2