1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
Description: Adjust buildsystem to avoid FTBFS with autoreconf.
CPPFLAGS must not be overridden, use the user variable AM_CPPFLAGS instead.
Set 'foreign' mode.
Applied-Upstream: http://repo.or.cz/w/zynjacku.git/commitdiff/3249d1578d73fbb
---
Makefile.am | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- zynjacku.orig/Makefile.am
+++ zynjacku/Makefile.am
@@ -21,7 +21,7 @@ DEFAULT_INCLUDES =
# we need this in order to include config.h with build dir != src dir
if NOT_TOP_BUILD
-CPPFLAGS += -I$(top_builddir)
+AM_CPPFLAGS = -I$(top_builddir)
endif
zynjacku_c_CFLAGS = -DDATA_DIR='"$(pkgdatadir)"' -Wall -g
--- zynjacku.orig/configure.ac
+++ zynjacku/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.61)
AC_INIT(zynjacku, 6)
AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(foreign)
AC_CONFIG_HEADER([config.h])
AM_CONDITIONAL(NOT_TOP_BUILD, test "$srcdir" != ".")
|
