From 566494734f1b024da6bf9afec740d5b0035074b5 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Sun, 20 Jan 2019 17:40:50 +0100 Subject: [PATCH 1/2] share/Makefile.am: respect DESTDIR value Create directory $(DESTDIR)/$(datadir) instead of $(datadir). --- share/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/Makefile.am b/share/Makefile.am index 143be1474..23c175dbf 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -7,8 +7,8 @@ datadir = @datadir@/$(PACKAGE_TARNAME) install-mkdirs: -@if test ! -d $(datadir); then \ - echo "mkdir -p $(datadir)"; \ - mkdir -p $(datadir); \ + echo "mkdir -p $(DESTDIR)$(datadir)"; \ + mkdir -p $(DESTDIR)$(datadir); \ fi install: install-mkdirs From b791511a109984dfcd7082165b3016fbe6ec6110 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Sun, 20 Jan 2019 18:06:57 +0100 Subject: [PATCH 2/2] Respect user defined value of datadir --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 81fff69b9..69957b38e 100644 --- a/configure.ac +++ b/configure.ac @@ -811,7 +811,6 @@ dnl dnl datadir dnl -datadir="$prefix/share" AC_SUBST_DIR([datadir]) RB_DEFINE_UNQUOTED([DATA_DIR], ["$datadir/${PACKAGE_TARNAME}"], [Directory where read-only assets go.])