summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Undheim <ruben.undheim@gmail.com>2018-10-28 08:42:50 +0000
committerRuben Undheim <ruben.undheim@gmail.com>2018-10-28 08:42:50 +0000
commitf52960afe9c34994cec256670c461b8ccf2d7146 (patch)
tree67a0c3774411625578c2c75c06ac854236de534e
parente5e8cea7827338057f7c175ba5d6abe33d2fe458 (diff)
No aclocal and automake 1.14
-rw-r--r--debian/patches/0006-No-aclocal-and-automake-1.14.patch72
-rw-r--r--debian/patches/series1
2 files changed, 73 insertions, 0 deletions
diff --git a/debian/patches/0006-No-aclocal-and-automake-1.14.patch b/debian/patches/0006-No-aclocal-and-automake-1.14.patch
new file mode 100644
index 0000000..b6678c8
--- /dev/null
+++ b/debian/patches/0006-No-aclocal-and-automake-1.14.patch
@@ -0,0 +1,72 @@
+From: Ruben Undheim <ruben.undheim@gmail.com>
+Date: Sun, 28 Oct 2018 08:42:24 +0000
+Subject: No aclocal and automake 1.14
+
+---
+ Makefile | 4 ++--
+ Xw/Makefile | 4 ++--
+ spiceparser/Makefile | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0725858..6feeb63 100644
+--- a/Makefile
++++ b/Makefile
+@@ -210,7 +210,7 @@ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+ DIST_SUBDIRS = $(SUBDIRS)
+-ACLOCAL = aclocal-1.14
++ACLOCAL = aclocal
+
+ # Override standard "make" target when compiling under TCL
+ ALL_TARGET = all-recursive
+@@ -218,7 +218,7 @@ AMTAR = $${TAR-tar}
+ AM_DEFAULT_VERBOSITY = 1
+ AUTOCONF = autoconf
+ AUTOHEADER = autoheader
+-AUTOMAKE = automake-1.14
++AUTOMAKE = automake
+ AWK = gawk
+ CC = gcc
+ CCDEPMODE = depmode=none
+diff --git a/Xw/Makefile b/Xw/Makefile
+index 3308da7..cf3d16b 100644
+--- a/Xw/Makefile
++++ b/Xw/Makefile
+@@ -202,13 +202,13 @@ am__relativize = \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+-ACLOCAL = aclocal-1.14
++ACLOCAL = aclocal
+ ALL_TARGET = all-recursive
+ AMTAR = $${TAR-tar}
+ AM_DEFAULT_VERBOSITY = 1
+ AUTOCONF = autoconf
+ AUTOHEADER = autoheader
+-AUTOMAKE = automake-1.14
++AUTOMAKE = automake
+ AWK = gawk
+ CC = gcc
+ CCDEPMODE = depmode=none
+diff --git a/spiceparser/Makefile b/spiceparser/Makefile
+index b96d343..2ea57ca 100644
+--- a/spiceparser/Makefile
++++ b/spiceparser/Makefile
+@@ -203,13 +203,13 @@ am__relativize = \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+-ACLOCAL = aclocal-1.14
++ACLOCAL = aclocal
+ ALL_TARGET = all-recursive
+ AMTAR = $${TAR-tar}
+ AM_DEFAULT_VERBOSITY = 1
+ AUTOCONF = autoconf
+ AUTOHEADER = autoheader
+-AUTOMAKE = automake-1.14
++AUTOMAKE = automake
+ AWK = gawk
+ CC = gcc
+ CCDEPMODE = depmode=none
diff --git a/debian/patches/series b/debian/patches/series
index 5b0933c..6f6dad5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
04_fix_manpage.patch
05_fix_string_format.patch
0005-Remove-asg.patch
+0006-No-aclocal-and-automake-1.14.patch