diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2006-08-29 12:50:54 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2006-08-29 12:50:54 +0000 |
| commit | 28ae4de294903364c4a0a4d8ef53272f374288b8 (patch) | |
| tree | 031e422cc94ed73223d2a1ee4d9633ad55662b6d /net-wireless | |
| parent | fix to adhere multilib-strict; bug 145456 thanks to Michael Weyershaeuser (diff) | |
| download | gentoo-2-28ae4de294903364c4a0a4d8ef53272f374288b8.tar.gz gentoo-2-28ae4de294903364c4a0a4d8ef53272f374288b8.tar.bz2 gentoo-2-28ae4de294903364c4a0a4d8ef53272f374288b8.zip | |
port previous multilib-strict fix to Makefile.am instead of .in; bug 145293
(Portage version: 2.1.1_rc1)
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/libbtctl/ChangeLog | 5 | ||||
| -rw-r--r-- | net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch | 21 |
2 files changed, 14 insertions, 12 deletions
diff --git a/net-wireless/libbtctl/ChangeLog b/net-wireless/libbtctl/ChangeLog index e5bb3f3b5fa9..1e53a5ff1cc0 100644 --- a/net-wireless/libbtctl/ChangeLog +++ b/net-wireless/libbtctl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-wireless/libbtctl # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/ChangeLog,v 1.26 2006/07/18 21:54:44 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/ChangeLog,v 1.27 2006/08/29 12:50:54 blubb Exp $ + + 29 Aug 2006; <blubb@gentoo.org> files/libbtctl-0.6.0-libdir.patch: + port previous multilib-strict fix to Makefile.am instead of .in; bug 145293 18 Jul 2006; Michael Hanselmann <hansmi@gentoo.org> libbtctl-0.6.0-r1.ebuild: diff --git a/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch b/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch index 78cbfbc42b18..1ff097842f52 100644 --- a/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch +++ b/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch @@ -1,12 +1,11 @@ -diff -Nru libbtctl-0.6.0.orig/src/Makefile.in libbtctl-0.6.0/src/Makefile.in ---- libbtctl-0.6.0.orig/src/Makefile.in 2005-11-22 00:02:52.000000000 +0200 -+++ libbtctl-0.6.0/src/Makefile.in 2006-04-22 12:11:12.586318250 +0300 -@@ -239,7 +239,7 @@ - btctl.defs btctl.override - +--- src/Makefile.am 2005-08-16 21:18:14.000000000 +0200 ++++ src/Makefile.am 2006-08-29 14:45:51.000000000 +0200 +@@ -16,7 +16,7 @@ + lib_LTLIBRARIES = libbtctl.la --@HAVE_PYTHON_TRUE@pydir = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages/ -+@HAVE_PYTHON_TRUE@pydir = $(libdir)/python$(PYTHON_VERSION)/site-packages/ - @HAVE_PYTHON_FALSE@pydir = - @HAVE_PYTHON_TRUE@py_LTLIBRARIES = btctl.la - @HAVE_PYTHON_FALSE@py_LTLIBRARIES = + if HAVE_PYTHON +-pydir = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages/ ++pydir = $(PYTHON_PREFIX)/$(libdir)/python$(PYTHON_VERSION)/site-packages/ + py_LTLIBRARIES = btctl.la + else + pydir = |