summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2011-10-06 00:20:06 +0000
committerMichael Weber <xmw@gentoo.org>2011-10-06 00:20:06 +0000
commit0d98f248a11da330a7dd7ebc613b8de2074eadc7 (patch)
treec93206b59bdc9fe240481ddbabbcc9e174a60b99 /x11-wm/cwm
parentRevbump to replace files/.desktop file with make_session_desktop (diff)
downloadgentoo-2-0d98f248a11da330a7dd7ebc613b8de2074eadc7.tar.gz
gentoo-2-0d98f248a11da330a7dd7ebc613b8de2074eadc7.tar.bz2
gentoo-2-0d98f248a11da330a7dd7ebc613b8de2074eadc7.zip
incorporate changes in Makefile by chneukirchen
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/cwm')
-rw-r--r--x11-wm/cwm/ChangeLog5
-rw-r--r--x11-wm/cwm/cwm-99999999.ebuild14
2 files changed, 10 insertions, 9 deletions
diff --git a/x11-wm/cwm/ChangeLog b/x11-wm/cwm/ChangeLog
index b412c5576b23..1f919c16bbb9 100644
--- a/x11-wm/cwm/ChangeLog
+++ b/x11-wm/cwm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-wm/cwm
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.26 2011/10/06 00:00:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.27 2011/10/06 00:20:06 xmw Exp $
+
+ 06 Oct 2011; Michael Weber <xmw@gentoo.org> cwm-99999999.ebuild:
+ incorporate changes in Makefile by chneukirchen
*cwm-20110913-r1 (05 Oct 2011)
*cwm-20110908-r1 (05 Oct 2011)
diff --git a/x11-wm/cwm/cwm-99999999.ebuild b/x11-wm/cwm/cwm-99999999.ebuild
index 1eb6632ece0c..2abe78d5fdce 100644
--- a/x11-wm/cwm/cwm-99999999.ebuild
+++ b/x11-wm/cwm/cwm-99999999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-99999999.ebuild,v 1.4 2011/09/11 22:06:30 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-99999999.ebuild,v 1.5 2011/10/06 00:20:06 xmw Exp $
EAPI=2
@@ -26,14 +26,12 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig
sys-devel/bison"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-20110726-Makefile.patch
- export LDADD="${LDFLAGS}"
- tc-export CC
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
}
src_install() {
- emake DESTDIR="${D}" install || die
- insinto /usr/share/applications
- doins "${FILESDIR}"/${PN}.desktop || die
+ emake DESTDIR="${D}" PREFIX=/usr install || die
+ dodoc README || die
+ make_session_desktop ${PN} ${PN}
}