[beast: 30/39] LIBRARY: skins: install skin files under $(pkgdatadir)/skins



commit 03f610e02c91abbdc32dba4820650c2de52257b9
Author: Tim Janik <timj gnu org>
Date:   Sat Sep 12 01:14:47 2015 +0200

    LIBRARY: skins: install skin files under $(pkgdatadir)/skins

 configure.ac                     |    2 --
 library/skins/Makefile.am        |    2 +-
 library/skins/images/Makefile.am |    2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8a952ab..0dd8676 100644
--- a/configure.ac
+++ b/configure.ac
@@ -568,8 +568,6 @@ AC_DEFUN([AC_BEAST_REQUIREMENTS],
     AC_SUBST(beastimagesdir)
     beastkeysdir=$beastbasedir/v$BIN_VERSION/keys
     AC_SUBST(beastkeysdir)
-    beastskinsdir=$beastbasedir/v$BIN_VERSION/skins
-    AC_SUBST(beastskinsdir)
 ])
 AC_DEFUN([AC_SUIDMAIN_REQUIREMENTS],
 [
diff --git a/library/skins/Makefile.am b/library/skins/Makefile.am
index 328f31b..f423f0d 100644
--- a/library/skins/Makefile.am
+++ b/library/skins/Makefile.am
@@ -11,6 +11,6 @@ skins_DATA = $(strip          \
        silvervein.skin         \
        white.skin              \
 )
-skinsdir = $(beastskinsdir)
+skinsdir = $(pkgdatadir)/skins
 
 EXTRA_DIST += $(skins_DATA)
diff --git a/library/skins/images/Makefile.am b/library/skins/images/Makefile.am
index a50f162..e09204c 100644
--- a/library/skins/images/Makefile.am
+++ b/library/skins/images/Makefile.am
@@ -9,6 +9,6 @@ images_DATA = $(strip           \
        moonpaper.png           \
        silvervein.png          \
 )
-imagesdir = $(beastskinsdir)/images
+imagesdir = $(pkgdatadir)/skins/images
 
 EXTRA_DIST += $(images_DATA)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]