From c5c679c14e7b9d123823eab0192703de243f5ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Thu, 12 Mar 2015 09:16:35 +0000 Subject: [PATCH] bugfix new buildsystem: makefile.in is in top_srcdir --- ChangeLog | 19 +++++++++++++++++++ ax_init_standard_project.m4 | 6 +++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad4f1b4..facce78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2015-03-05 14:48 marc + + * debian/control.in: uic is required if qt is used + +2015-03-05 14:05 marc + + * ChangeLog, m4/ax_check_qt.m4: don't stop if qt is not found; more + elegant way for adding qt rules + +2015-03-05 13:44 marc + + * m4/ax_check_qt.m4: don't stop if qt is not found; more elegant + way for adding qt rules + +2015-03-05 13:27 marc + + * m4/ax_check_qt.m4: don't stop if qt is not found; more elegant + way for adding qt rules + 2015-03-05 13:21 marc * m4/ax_check_qt.m4, src/makefile.am: don't stop if qt is not diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 3f9fd31..37fa859 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -39,9 +39,9 @@ dnl refers to ${prefix}. Thus we have to use `eval' twice. AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [ sh_add_makefile_target_dep() { - sed -i ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${3}" - if ! egrep -q "${1}:.* ${2}" "${3}"; then - echo "${1}: ${2}" >> "${3}" + sed -i ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${top_srcdir}/${3}" + if ! egrep -q "${1}:.* ${2}" "${top_srcdir}/${3}"; then + echo "${1}: ${2}" >> "${top_srcdir}/${3}" fi } sh_add_makefile_target_dep "$1" "$2" "$3"