summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmando Di Cianno <fafhrd@gentoo.org>2004-10-04 01:18:15 +0000
committerArmando Di Cianno <fafhrd@gentoo.org>2004-10-04 01:18:15 +0000
commit1097c699a55b37f5d5e46d3b0b8e318474ae14ea (patch)
treeed987d20db559cecb949c20f7ed5d1d890800609 /gnustep-base/gnustep-make
parentx11-base/xfree -> virtual/x11 (Manifest recommit) (diff)
downloadgentoo-2-1097c699a55b37f5d5e46d3b0b8e318474ae14ea.tar.gz
gentoo-2-1097c699a55b37f5d5e46d3b0b8e318474ae14ea.tar.bz2
gentoo-2-1097c699a55b37f5d5e46d3b0b8e318474ae14ea.zip
Updated to use GENTOO_GNUSTEP_ROOT variable from gnustep.eclass
Diffstat (limited to 'gnustep-base/gnustep-make')
-rw-r--r--gnustep-base/gnustep-make/ChangeLog6
-rw-r--r--gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild12
-rw-r--r--gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild12
3 files changed, 17 insertions, 13 deletions
diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index fbf5f407fe41..d2297f1c3cab 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnustep-base/gnustep-make
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.6 2004/09/28 17:50:02 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.7 2004/10/04 01:17:28 fafhrd Exp $
+
+ 03 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org>
+ gnustep-make-1.10.0.ebuild, gnustep-make-1.10.1_pre20040928.ebuild:
+ Updated to use GENTOO_GNUSTEP_ROOT variable from gnustep.eclass
*gnustep-make-1.10.1_pre20040927 (28 Sep 2004)
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild
index faa2ac828318..27413d033bbc 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild,v 1.1 2004/09/24 01:03:52 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild,v 1.2 2004/10/04 01:17:28 fafhrd Exp $
inherit gnustep
@@ -37,8 +37,8 @@ src_unpack() {
src_compile() {
cd ${S}
- myconf="--prefix=/usr/GNUstep"
- myconf="$myconf --with-network-root=/usr/GNUstep/Network"
+ myconf="--prefix=${GENTOO_GNUSTEP_ROOT}"
+ myconf="$myconf --with-network-root=${GENTOO_GNUSTEP_ROOT}/Network"
myconf="$myconf --with-tar=/bin/tar"
econf $myconf || die "configure failed"
@@ -66,19 +66,19 @@ src_install() {
die "no Makefile found"
fi
- . ${D}usr/GNUstep/System/Library/Makefiles/GNUstep.sh
+ . ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles/GNUstep.sh
if [ `use doc` ]; then
cd Documentation
make INSTALL_ROOT=${D} \
GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
- GNUSTEP_MAKEFILES=${D}usr/GNUstep/System/Library/Makefiles \
+ GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
GNUSTEP_USER_ROOT=${TMP}/GNUstep \
GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
all || die "doc build failed"
make INSTALL_ROOT=${D} \
GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
- GNUSTEP_MAKEFILES=${D}usr/GNUstep/System/Library/Makefiles \
+ GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
GNUSTEP_USER_ROOT=${TMP}/GNUstep \
GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
install || die "doc install failed"
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild
index 00e6a65d9609..542370e0aa37 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild,v 1.1 2004/09/28 17:50:02 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild,v 1.2 2004/10/04 01:17:28 fafhrd Exp $
ECVS_CVS_COMMAND="cvs -q"
ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -46,8 +46,8 @@ src_unpack() {
src_compile() {
cd ${S}
- myconf="--prefix=/usr/GNUstep"
- myconf="$myconf --with-network-root=/usr/GNUstep/Network"
+ myconf="--prefix=${GENTOO_GNUSTEP_ROOT}"
+ myconf="$myconf --with-network-root=${GENTOO_GNUSTEP_ROOT}/Network"
myconf="$myconf --with-tar=/bin/tar"
econf $myconf || die "configure failed"
@@ -75,19 +75,19 @@ src_install() {
die "no Makefile found"
fi
- . ${D}usr/GNUstep/System/Library/Makefiles/GNUstep.sh
+ . ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles/GNUstep.sh
if [ `use doc` ]; then
cd Documentation
make INSTALL_ROOT=${D} \
GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
- GNUSTEP_MAKEFILES=${D}usr/GNUstep/System/Library/Makefiles \
+ GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
GNUSTEP_USER_ROOT=${TMP}/GNUstep \
GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
all || die "doc build failed"
make INSTALL_ROOT=${D} \
GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
- GNUSTEP_MAKEFILES=${D}usr/GNUstep/System/Library/Makefiles \
+ GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
GNUSTEP_USER_ROOT=${TMP}/GNUstep \
GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
install || die "doc install failed"