[SCM] pd-flite/master: Fixed helppatch-install-dir patch
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Mon May 29 20:55:47 UTC 2017
The following commit has been merged in the master branch:
commit 4072c76418e72108121bc7a8b118ecccde8803a3
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Mon May 29 22:55:21 2017 +0200
Fixed helppatch-install-dir patch
the original patch would patch ./configure, which then gets
re-generated (and all changes are lost).
this patch instead fixes the m4 sources.
Closes: #863658
diff --git a/debian/patches/fix-help-files-install-dir.patch b/debian/patches/fix-help-files-install-dir.patch
index 4005c84..9855f8b 100644
--- a/debian/patches/fix-help-files-install-dir.patch
+++ b/debian/patches/fix-help-files-install-dir.patch
@@ -1,25 +1,27 @@
Description: fix configure to install help-files to extdir
Author: Roman Haefeli <reduzent at gmail.com>
---- a/configure
-+++ b/configure
-@@ -4134,9 +4134,6 @@
-
-
+Last-Update: 2017-05-29
+--- pd-flite.orig/common/m4/ax_pd_external.m4
++++ pd-flite/common/m4/ax_pd_external.m4
+@@ -146,9 +146,6 @@
+ [pddir="\${prefix}/pd"])
+ AC_SUBST(pddir)
- pddocdir="${pddir}/doc/5.reference"
--
+- AC_SUBST(pddocdir)
-
##-- pdincludedir
-
- # Check whether --with-pd-include was given.
-@@ -4166,6 +4163,10 @@
- pdexternsdir="$pdextdir"
+ AC_ARG_WITH(pd-include,
+ AC_HELP_STRING([--with-pd-include=DIR], [Pd include directory (default=NONE)]),
+@@ -171,6 +168,11 @@
pdexecdir="$pdextdir"
-
-+ ##-- pddocdir
+ AC_SUBST(pdexternsdir)
+ AC_SUBST(pdexecdir)
++
+ # Nowadays the help files usually are installed besides the class files
+ pddocdir="${pdextdir}"
++ AC_SUBST(pddocdir)
+
-
## pd-directory/ies
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
--
pd-flite packaging
More information about the pkg-multimedia-commits
mailing list