diff options
| author |   Harald van Dijk <truedfx@gentoo.org> | 2006-05-04 16:17:40 +0000 |
|---|---|---|
| committer | Harald van Dijk <truedfx@gentoo.org> | 2006-05-04 16:17:40 +0000 |
| commit | 1da33a7f6cd2410d88d9158fd3576d9a3c8db7e9 (patch) | |
| tree | 6841d3f2b6102031847fea5107282f1ac503c835 /x11-libs/dnd | |
| parent | * bump (diff) | |
| download | gentoo-2-1da33a7f6cd2410d88d9158fd3576d9a3c8db7e9.tar.gz gentoo-2-1da33a7f6cd2410d88d9158fd3576d9a3c8db7e9.tar.bz2 gentoo-2-1da33a7f6cd2410d88d9158fd3576d9a3c8db7e9.zip | |
Don't install in ${D}/${D} (#132162)
(Portage version: 2.1_pre10-r2)
Diffstat (limited to 'x11-libs/dnd')
| -rw-r--r-- | x11-libs/dnd/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/dnd/dnd-1.1-r1.ebuild | 4 | ||||
| -rw-r--r-- | x11-libs/dnd/files/Makefile-fix.patch | 3 | ||||
| -rw-r--r-- | x11-libs/dnd/files/digest-dnd-1.1 | 2 | ||||
| -rw-r--r-- | x11-libs/dnd/files/digest-dnd-1.1-r1 | 2 |
5 files changed, 13 insertions, 4 deletions
diff --git a/x11-libs/dnd/ChangeLog b/x11-libs/dnd/ChangeLog index a6931bab814a..9a936a2e5cc4 100644 --- a/x11-libs/dnd/ChangeLog +++ b/x11-libs/dnd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/dnd # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/dnd/ChangeLog,v 1.13 2006/01/25 01:09:30 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/dnd/ChangeLog,v 1.14 2006/05/04 16:17:40 truedfx Exp $ + + 04 May 2006; Harald van Dijk <truedfx@gentoo.org> + files/Makefile-fix.patch, dnd-1.1-r1.ebuild: + Don't install in ${D}/${D} (bug #132162) *dnd-1.1-r1 (25 Jan 2006) diff --git a/x11-libs/dnd/dnd-1.1-r1.ebuild b/x11-libs/dnd/dnd-1.1-r1.ebuild index ad3422a36291..78990048a1e4 100644 --- a/x11-libs/dnd/dnd-1.1-r1.ebuild +++ b/x11-libs/dnd/dnd-1.1-r1.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/x11-libs/dnd/dnd-1.1-r1.ebuild,v 1.1 2006/01/25 01:09:30 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/dnd/dnd-1.1-r1.ebuild,v 1.2 2006/05/04 16:17:40 truedfx Exp $ inherit eutils @@ -37,5 +37,5 @@ src_compile() { } src_install () { - make DESTDIR="${D}" prefix="${D}"/usr install || die + make DESTDIR="${D}" install || die } diff --git a/x11-libs/dnd/files/Makefile-fix.patch b/x11-libs/dnd/files/Makefile-fix.patch index 5ab0672d0f4d..a22a1b888ce7 100644 --- a/x11-libs/dnd/files/Makefile-fix.patch +++ b/x11-libs/dnd/files/Makefile-fix.patch @@ -6,7 +6,8 @@ exec_prefix = @exec_prefix@ -LIB_DIR = @libdir@ +LIB_DIR = $(DESTDIR)@libdir@ - INC_DIR = @includedir@/OffiX +-INC_DIR = @includedir@/OffiX ++INC_DIR = $(DESTDIR)@includedir@/OffiX COMPILE = $(CC) $(INCLUDES) $(CFLAGS) -c @@ -42,19 +42,22 @@ diff --git a/x11-libs/dnd/files/digest-dnd-1.1 b/x11-libs/dnd/files/digest-dnd-1.1 index 3c4ecda6aab6..fd2270d6b7ad 100644 --- a/x11-libs/dnd/files/digest-dnd-1.1 +++ b/x11-libs/dnd/files/digest-dnd-1.1 @@ -1 +1,3 @@ MD5 0d6b2a44801396e99e36831c87c25d6e dnd.1.1.tgz 227598 +RMD160 eac0744baa344024db2e40c0582c11d722baba48 dnd.1.1.tgz 227598 +SHA256 ffd9b74f1bf8e5c18a4745ef89e9c6618f9507ec09a010c4bf15481a3f130804 dnd.1.1.tgz 227598 diff --git a/x11-libs/dnd/files/digest-dnd-1.1-r1 b/x11-libs/dnd/files/digest-dnd-1.1-r1 index 3c4ecda6aab6..fd2270d6b7ad 100644 --- a/x11-libs/dnd/files/digest-dnd-1.1-r1 +++ b/x11-libs/dnd/files/digest-dnd-1.1-r1 @@ -1 +1,3 @@ MD5 0d6b2a44801396e99e36831c87c25d6e dnd.1.1.tgz 227598 +RMD160 eac0744baa344024db2e40c0582c11d722baba48 dnd.1.1.tgz 227598 +SHA256 ffd9b74f1bf8e5c18a4745ef89e9c6618f9507ec09a010c4bf15481a3f130804 dnd.1.1.tgz 227598 |