From 39bfd11c39bce0a49f72b54edcc2a7bb38962af0 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Thu, 16 Jan 2014 16:58:47 +0100 Subject: [PATCH] build fixes --- Makefile.am | 3 ++- configure.ac | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9efa5a9..ec71d7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ EXTRA_SCRIPTS = btrdir = $(prefix) dist_bin_SCRIPTS = $(BTR_BIN) -nobase_dist_btr_SCRIPTS = $(BTR_SHARE) +nobase_dist_btr_SCRIPTS = $(BTR_SCRIPTS) +nobase_dist_btr_DATA = $(BTR_SHARE) diff --git a/configure.ac b/configure.ac index f5f981f..7247285 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,22 @@ AC_INIT([btr], [0.4.0], [mike@php.net]) -AC_CONFIG_SRCDIR([./share/btr/btr.sh]) AM_INIT_AUTOMAKE([foreign]) AM_SILENT_RULES([yes]) -BTR_BIN='$(echo $$abs_srcdir/bin/*)' -BTR_SHARE='$(echo $$abs_srcdir/share/{*,*/*}/*.*)' +AC_CONFIG_SRCDIR([./share/btr/btr.sh]) + +AC_MSG_CHECKING([for bin/ scripts]); + BTR_BIN=$(find $srcdir/bin -type f -perm -a=x | xargs) +AC_MSG_RESULT([$BTR_BIN]) AC_SUBST([BTR_BIN], [$BTR_BIN]) + +AC_MSG_CHECKING([for share/ scripts]) + BTR_SCRIPTS=$(find $srcdir/share/btr -type f -perm -a=x | xargs) +AC_MSG_RESULT([$BTR_SCRIPTS]) +AC_SUBST([BTR_SCRIPTS], [$BTR_SCRIPTS]) + +AC_MSG_CHECKING([for share/ data]) + BTR_SHARE=$(find $srcdir/share/btr -type f ! -perm -a=x | xargs) +AC_MSG_RESULT([$BTR_SHARE]) AC_SUBST([BTR_SHARE], [$BTR_SHARE]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- 2.30.2