diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-09-04 15:22:40 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-09-04 15:22:40 +0000 |
| commit | f4cb4aa8181cf78e11c6c8f72c8f4cf9ef5c10a9 (patch) | |
| tree | f1ae525eea60c1c84157fe82f7fa44af5e203a86 /sys-fs/dmraid | |
| parent | hald init script dependencies updated, #125938 (diff) | |
| download | gentoo-2-f4cb4aa8181cf78e11c6c8f72c8f4cf9ef5c10a9.tar.gz gentoo-2-f4cb4aa8181cf78e11c6c8f72c8f4cf9ef5c10a9.tar.bz2 gentoo-2-f4cb4aa8181cf78e11c6c8f72c8f4cf9ef5c10a9.zip | |
Updated destdir patch to fix bug 145973, thanks to Ian Stakenvicius <ian@syndicated-productions.com> and Michael Weyershäuser <thedude0001@gmx.de>
(Portage version: 2.1.1_rc1-r2)
Diffstat (limited to 'sys-fs/dmraid')
| -rw-r--r-- | sys-fs/dmraid/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-fs/dmraid/dmraid-1.0.0_rc12.ebuild | 4 | ||||
| -rw-r--r-- | sys-fs/dmraid/files/dmraid-destdir-fix.patch | 34 |
3 files changed, 44 insertions, 3 deletions
diff --git a/sys-fs/dmraid/ChangeLog b/sys-fs/dmraid/ChangeLog index fe1c0de9742a..57848f777b1a 100644 --- a/sys-fs/dmraid/ChangeLog +++ b/sys-fs/dmraid/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/dmraid # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.6 2006/09/02 16:08:16 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.7 2006/09/04 15:22:40 genstef Exp $ + + 04 Sep 2006; Stefan Schweizer <genstef@gentoo.org> + +files/dmraid-destdir-fix.patch, -files/dmraid-manpage-destdir.patch, + dmraid-1.0.0_rc12.ebuild: + Updated destdir patch to fix bug 145973, thanks to Ian Stakenvicius + <ian@syndicated-productions.com> and Michael Weyershäuser + <thedude0001@gmx.de> 02 Sep 2006; Stefan Schweizer <genstef@gentoo.org> dmraid-1.0.0_rc12.ebuild: diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc12.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc12.ebuild index b516f25df3c8..b5f5956e2801 100644 --- a/sys-fs/dmraid/dmraid-1.0.0_rc12.ebuild +++ b/sys-fs/dmraid/dmraid-1.0.0_rc12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc12.ebuild,v 1.2 2006/09/02 16:08:16 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc12.ebuild,v 1.3 2006/09/04 15:22:40 genstef Exp $ inherit linux-info flag-o-matic @@ -36,7 +36,7 @@ pkg_setup() { src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/dmraid-manpage-destdir.patch + epatch ${FILESDIR}/dmraid-destdir-fix.patch } src_compile() { diff --git a/sys-fs/dmraid/files/dmraid-destdir-fix.patch b/sys-fs/dmraid/files/dmraid-destdir-fix.patch new file mode 100644 index 000000000000..07c6b442f9a6 --- /dev/null +++ b/sys-fs/dmraid/files/dmraid-destdir-fix.patch @@ -0,0 +1,34 @@ +--- make.tmpl.in.old 2006-09-03 14:38:36.000000000 -0400 ++++ make.tmpl.in 2006-09-03 14:37:43.000000000 -0400 +@@ -21,21 +21,21 @@ + SOFLAG += @SOFLAG@ + + # Setup directory variables +-prefix = $(DESTDIR)@prefix@ +-exec_prefix = $(DESTDIR)@exec_prefix@ +-bindir = @bindir@ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++bindir = $(DESTDIR)@bindir@ + ifeq ("@KLIBC@", "no") +- libdir = @libdir@ +- sbindir = @sbindir@ +- includedir = @includedir@ +- infodir = @infodir@ +- mandir = @mandir@ ++ libdir = $(DESTDIR)@libdir@ ++ sbindir = $(DESTDIR)@sbindir@ ++ includedir = $(DESTDIR)@includedir@ ++ infodir = $(DESTDIR)@infodir@ ++ mandir = $(DESTDIR)@mandir@ + else + libdir = $(DESTDIR)@KLIBC_LIB_DIR@ + sbindir = $(DESTDIR)@KLIBC_SBIN_DIR@ + includedir = $(DESTDIR)@KLIBC_INCLUDE_DIR@ +- infodir = @infodir@ +- mandir = @mandir@ ++ infodir = $(DESTDIR)@infodir@ ++ mandir = $(DESTDIR)@mandir@ + endif + + |