[beast: 31/39] DATA: install image files under $(pkgdatadir)/images

[Tim Janik <timj src gnome org>]

commit 0112862a9e9467b30aec4587a848a68819d5412b
Author: Tim Janik <timj gnu org>
Date:   Sat Sep 12 01:16:41 2015 +0200

    DATA: install image files under $(pkgdatadir)/images

 configure.ac            |    2 --
 data/Makefile.am        |    2 +-
 docs/images/Makefile.am |    2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0dd8676..4c4d117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -564,8 +564,6 @@ AC_DEFUN([AC_BEAST_REQUIREMENTS],
 
     # --- BEAST paths ---
     beastbasedir=\${datadir}/beast
-    beastimagesdir=$beastbasedir/v$BIN_VERSION/images
-    AC_SUBST(beastimagesdir)
     beastkeysdir=$beastbasedir/v$BIN_VERSION/keys
     AC_SUBST(beastkeysdir)
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
index d41e3ca..ad1e628 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,7 +12,7 @@ public_images = $(strip         \
        beast-splash.png        \
 )
 images_DATA = ${public_images}
-imagesdir = ${beastimagesdir}
+imagesdir = $(pkgdatadir)/images
 EXTRA_DIST += $(private_images) $(public_images)
 
 # generate image header files
diff --git a/docs/images/Makefile.am b/docs/images/Makefile.am
index 360831f..90fa44a 100644
--- a/docs/images/Makefile.am
+++ b/docs/images/Makefile.am
@@ -7,5 +7,5 @@ SVG_FILES = beast-components.svg  beast-progs.svg  module-voices.svg
 
 # PNG_FILES = beast-components.png  beast-progs.png  module-voices.png
 # docimages_DATA = $(PNG_FILES)
-# docimagesdir = $(beastimagesdir)
+# docimagesdir = $(pkgdatadir)/images
 # EXTRA_DIST += $(PNG_FILES)