[SCM] rtmidi/master: Unbreak configure.ac if 'prefix' is defined
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Thu Oct 5 22:47:26 UTC 2017
The following commit has been merged in the master branch:
commit 2c864f52c4e531baa2d734c4b9a59e9e1c750e0f
Author: IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>
Date: Fri Oct 6 00:31:50 2017 +0200
Unbreak configure.ac if 'prefix' is defined
diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 31781ab..4bb0d53 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -65,7 +65,20 @@
--- rtmidi.orig/configure.ac
+++ rtmidi/configure.ac
-@@ -109,14 +109,20 @@
+@@ -74,12 +74,6 @@
+ [AC_SUBST( cppflag, [-D__RTMIDI_DEBUG__] ) AC_SUBST( cxxflag, [-g] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
+ [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O3] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
+
+-# Set paths if prefix is defined
+-if test "x$prefix" != "x" && test "x$prefix" != "xNONE"; then
+- LIBS="$LIBS -L$prefix/lib"
+- CPPFLAGS="$CPPFLAGS -I$prefix/include/rtmidi"
+-fi
+-
+ # For -I and -D flags
+ CPPFLAGS="$CPPFLAGS $cppflag"
+
+@@ -109,14 +103,20 @@
AC_CANONICAL_HOST
AC_SUBST( api, [""] )
--
RtMidi packaging
More information about the pkg-multimedia-commits
mailing list