[SCM] pd-pdstring/master: Moved fix-help-files patch to common/m4
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Thu May 4 13:42:25 UTC 2017
The following commit has been merged in the master branch:
commit 79bf8985490780f95a89ee2ffb2e44c6b8c337b9
Author: IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>
Date: Thu May 4 15:35:07 2017 +0200
Moved fix-help-files patch to common/m4
so it doesn't get overwritten on autoreconf...
diff --git a/debian/patches/fix-help-files-install-dir.patch b/debian/patches/fix-help-files-install-dir.patch
index 56effff..0479fe7 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
-@@ -3550,9 +3550,6 @@
-
-
+Last-Update: 2017-05-04
+--- pd-pdstring.orig/common/m4/ax_pd_external.m4
++++ pd-pdstring/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.
-@@ -3582,6 +3579,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-pdstring packaging
More information about the pkg-multimedia-commits
mailing list