summaryrefslogtreecommitdiff
path: root/pcr/sword-svn/automake.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pcr/sword-svn/automake.patch')
-rw-r--r--pcr/sword-svn/automake.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/pcr/sword-svn/automake.patch b/pcr/sword-svn/automake.patch
new file mode 100644
index 000000000..3cfd5eb44
--- /dev/null
+++ b/pcr/sword-svn/automake.patch
@@ -0,0 +1,52 @@
+diff -Naur sword.orig/configure.ac sword.new/configure.ac
+--- sword.orig/configure.ac 2013-01-13 12:46:13.000000000 +0100
++++ sword.new/configure.ac 2013-01-13 12:47:34.000000000 +0100
+@@ -13,7 +13,7 @@
+ AC_CANONICAL_TARGET
+ AM_INIT_AUTOMAKE
+
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADERS(include/config.h)
+
+ AC_CONFIG_MACRO_DIR([m4])
+
+diff -Naur sword.orig/examples/cmdline/Makefile.am sword.new/examples/cmdline/Makefile.am
+--- sword.orig/examples/cmdline/Makefile.am 2013-01-13 12:46:13.000000000 +0100
++++ sword.new/examples/cmdline/Makefile.am 2013-01-13 12:53:55.000000000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+
+diff -Naur sword.orig/tests/Makefile.am sword.new/tests/Makefile.am
+--- sword.orig/tests/Makefile.am 2013-01-13 12:46:14.000000000 +0100
++++ sword.new/tests/Makefile.am 2013-01-13 12:54:33.000000000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+
+diff -Naur sword.orig/utilities/Makefile.am sword.new/utilities/Makefile.am
+--- sword.orig/utilities/Makefile.am 2013-01-13 12:46:13.000000000 +0100
++++ sword.new/utilities/Makefile.am 2013-01-13 12:56:12.000000000 +0100
+@@ -1,8 +1,8 @@
+ AUTOMAKE_OPTIONS = 1.6
+ SUBDIRS = diatheke
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+ noinst_PROGRAMS = cipherraw lexdump \