[beast: 32/39] LIBRARY: keys: install key files under $(pkgdatadir)/keys



commit aafa6521c65eeaa9281d90e42af17e5cd67cf61f
Author: Tim Janik <timj gnu org>
Date:   Sat Sep 12 01:18:22 2015 +0200

    LIBRARY: keys: install key files under $(pkgdatadir)/keys

 configure.ac             |    5 -----
 library/keys/Makefile.am |    2 +-
 2 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4c4d117..592c231 100644
--- a/configure.ac
+++ b/configure.ac
@@ -561,11 +561,6 @@ AC_DEFUN([AC_BEAST_REQUIREMENTS],
     )
     CFLAGS=$cflags
     LDFLAGS=$ldflags
-
-    # --- BEAST paths ---
-    beastbasedir=\${datadir}/beast
-    beastkeysdir=$beastbasedir/v$BIN_VERSION/keys
-    AC_SUBST(beastkeysdir)
 ])
 AC_DEFUN([AC_SUIDMAIN_REQUIREMENTS],
 [
diff --git a/library/keys/Makefile.am b/library/keys/Makefile.am
index eae6d13..cfa2527 100644
--- a/library/keys/Makefile.am
+++ b/library/keys/Makefile.am
@@ -5,6 +5,6 @@ keys_DATA = $(strip             \
        keyrc.de                \
        keyrc.us                \
 )
-keysdir = $(beastkeysdir)
+keysdir = $(pkgdatadir)/keys
 
 EXTRA_DIST += $(keys_DATA)


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