From 5632936ddd40447db554d4f83113b10e3b93090e Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 27 Oct 2022 14:24:41 -0600 Subject: [PATCH] Add lib/edit/towns/Makefile.am to handle installation of the files there. Resolves https://github.com/hengband/hengband/issues/2731 . --- configure.ac | 2 +- lib/edit/Makefile.am | 10 +++++----- lib/edit/towns/Makefile.am | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 lib/edit/towns/Makefile.am diff --git a/configure.ac b/configure.ac index f2f60b145..7828d1f51 100644 --- a/configure.ac +++ b/configure.ac @@ -150,5 +150,5 @@ AC_FUNC_STRFTIME AC_FUNC_VPRINTF AC_CHECK_FUNCS(gethostname mkdir select socket strtol vsnprintf mkstemp usleep) -AC_CONFIG_FILES(Makefile src/Makefile lib/Makefile lib/apex/Makefile lib/bone/Makefile lib/data/Makefile lib/edit/Makefile lib/file/Makefile lib/help/Makefile lib/info/Makefile lib/pref/Makefile lib/save/Makefile lib/script/Makefile lib/user/Makefile lib/xtra/Makefile lib/xtra/graf/Makefile lib/xtra/music/Makefile lib/xtra/sound/Makefile) +AC_CONFIG_FILES(Makefile src/Makefile lib/Makefile lib/apex/Makefile lib/bone/Makefile lib/data/Makefile lib/edit/Makefile lib/edit/towns/Makefile lib/file/Makefile lib/help/Makefile lib/info/Makefile lib/pref/Makefile lib/save/Makefile lib/script/Makefile lib/user/Makefile lib/xtra/Makefile lib/xtra/graf/Makefile lib/xtra/music/Makefile lib/xtra/sound/Makefile) AC_OUTPUT() diff --git a/lib/edit/Makefile.am b/lib/edit/Makefile.am index f490ee5e4..79cd1d1a8 100644 --- a/lib/edit/Makefile.am +++ b/lib/edit/Makefile.am @@ -1,5 +1,7 @@ ## Makefile.am -- Process this file with automake to process Makefile.in +AUTOMAKE_OPTIONS = foreign + angband_files = \ ArtifactDefinitions.txt BaseItemDefinitions.txt ClassMagicDefinitions.txt \ ClassSkillDefinitions.txt DungeonDefinitions.txt EgoDefinitions.txt \ @@ -15,15 +17,13 @@ angband_files = \ q00water.txt q0clone0.txt q0dumpwitness.txt q0fields.txt \ q0thief1.txt q0thief2.txt q0willow.txt q_oberon.txt \ q_pref.txt q_random.txt q_serpen.txt q_warg.txt \ - qdarkelf.txt qhaunted.txt \ - towns/01_Outpost_Full.txt towns/01_Outpost_Lite.txt \ - towns/01_Outpost_OnlyAngband.txt towns/02_Telmora.txt \ - towns/03_Morivant.txt towns/04_Angwil.txt towns/05_Zul.txt \ - towns/06_Rlyeh_Obsoleted.txt + qdarkelf.txt qhaunted.txt EXTRA_DIST = \ $(angband_files) +SUBDIRS = towns + if SET_GID angbanddir = @DEFAULT_LIB_PATH@/edit diff --git a/lib/edit/towns/Makefile.am b/lib/edit/towns/Makefile.am new file mode 100644 index 000000000..3fdc4899f --- /dev/null +++ b/lib/edit/towns/Makefile.am @@ -0,0 +1,21 @@ +## Makefile.am -- Process this file with automake to process Makefile.in + +angband_files = \ + 01_Outpost_Full.txt \ + 01_Outpost_Lite.txt \ + 01_Outpost_OnlyAngband.txt \ + 02_Telmora.txt \ + 03_Morivant.txt \ + 04_Angwil.txt \ + 05_Zul.txt \ + 06_Rlyeh_Obsoleted.txt + +EXTRA_DIST = \ + $(angband_files) + +if SET_GID +angbanddir = @DEFAULT_LIB_PATH@/edit/towns + +angband_DATA = \ + $(angband_files) +endif -- 2.11.0