diff options
author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-05-31 16:42:29 -0300 |
---|---|---|
committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-05-31 16:42:29 -0300 |
commit | 09f44b6c97a0331ed69393de9d682b79d5d2620e (patch) | |
tree | 86741a3672a6de75fbeed1bbf19f1c0c5734c0a5 /pcr/sword-svn/automake.patch | |
parent | 2d065a8d237bbc04912ac803a886f566406ce273 (diff) | |
parent | 2ac25104895a9f912a953b50900ddbc7427603af (diff) | |
download | abslibre-09f44b6c97a0331ed69393de9d682b79d5d2620e.tar.gz abslibre-09f44b6c97a0331ed69393de9d682b79d5d2620e.tar.bz2 abslibre-09f44b6c97a0331ed69393de9d682b79d5d2620e.zip |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'pcr/sword-svn/automake.patch')
-rw-r--r-- | pcr/sword-svn/automake.patch | 52 |
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 \ |