projects
/
m6w6
/
btr
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
ef064f1
)
build fixes
author
Michael Wallner
<mike@php.net>
Thu, 16 Jan 2014 15:58:47 +0000
(16:58 +0100)
committer
Michael Wallner
<mike@php.net>
Thu, 16 Jan 2014 15:58:47 +0000
(16:58 +0100)
Makefile.am
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 9efa5a9eaedabf8f7217a56604d74d9a0db9b690..ec71d7bd5cb2684c546fc039a60e47c557d3c639 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,4
+1,5
@@
EXTRA_SCRIPTS =
btrdir = $(prefix)
dist_bin_SCRIPTS = $(BTR_BIN)
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 f5f981fe2424a3e8e0df206595cf7a0518fd6bf3..7247285c653e74a781142ed1335406693429d881 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,10
+1,22
@@
AC_INIT([btr], [0.4.0], [mike@php.net])
AC_INIT([btr], [0.4.0], [mike@php.net])
-AC_CONFIG_SRCDIR([./share/btr/btr.sh])
AM_INIT_AUTOMAKE([foreign])
AM_SILENT_RULES([yes])
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_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_SUBST([BTR_SHARE], [$BTR_SHARE])
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
AC_CONFIG_FILES([Makefile])
AC_OUTPUT