From 5ad3d9a57bcf7fdd4087810be29da9b821f1ec6e Mon Sep 17 00:00:00 2001
From: Seemant Kulleen <seemant@gentoo.org>
Date: Sun, 1 Dec 2002 23:01:11 +0000
Subject: emake->make

---
 sys-devel/flex/ChangeLog             |  8 +++++++-
 sys-devel/flex/flex-2.5.23.ebuild    | 30 +++++++++++++++---------------
 sys-devel/flex/flex-2.5.4a-r5.ebuild | 30 +++++++++++++++---------------
 3 files changed, 37 insertions(+), 31 deletions(-)

(limited to 'sys-devel/flex')

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 21c84e5d6aec..2d6585e7286a 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for sys-devel/flex
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.4 2002/11/18 15:36:01 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.5 2002/12/01 23:01:11 seemant Exp $
 
 *flex-2.5.23 (18 Nov 2002)
 
+  01 Dec 2002; Seemant Kulleen <seemant@gentoo.org> flex-2.5.23.ebuild
+  flex-2.5.4a-r5.ebuild :
+
+  emake -> emake || make.  Closes bug #11446 by bartelt@gentoo.org (Ulf
+  Bartelt)
+
   18 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
 
   Update version.
diff --git a/sys-devel/flex/flex-2.5.23.ebuild b/sys-devel/flex/flex-2.5.23.ebuild
index 6b1abab1b3fd..debfda69d329 100644
--- a/sys-devel/flex/flex-2.5.23.ebuild
+++ b/sys-devel/flex/flex-2.5.23.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.23.ebuild,v 1.1 2002/11/18 15:36:01 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.23.ebuild,v 1.2 2002/12/01 23:01:11 seemant Exp $
 
-S="${WORKDIR}/${P}"
+S=${WORKDIR}/${P}
 DESCRIPTION="GNU lexical analyser generator"
 #SRC_URI="ftp://ftp.gnu.org/gnu/non-gnu/flex/flex-2.5.4a.tar.gz"
 SRC_URI="ftp://ftp.uncg.edu/people/wlestes/${P}.tar.gz"
@@ -24,23 +24,23 @@ src_compile() {
 
 	econf ${myconf} || die
 
-    if [ -z "`use static`" ]
-    then
-        emake || die
-    else
-        emake LDFLAGS=-static || die
-    fi
+	if [ -z "`use static`" ]
+	then
+		emake || make || die
+	else
+		emake LDFLAGS=-static || die
+	fi
 }
 
 src_install() {
-    einstall || die
+	einstall || die
 	
-    if [ -z "`use build`" ]
-    then
-        dodoc AUTHORS COPYING ChangeLog NEWS ONEWS README* RoadMap THANKS TODO
-    else
-        rm -rf ${D}/usr/share ${D}/usr/include ${D}/usr/lib
-    fi
+	if [ -z "`use build`" ]
+	then
+		dodoc AUTHORS COPYING ChangeLog NEWS ONEWS README* RoadMap THANKS TODO
+	else
+		rm -rf ${D}/usr/share ${D}/usr/include ${D}/usr/lib
+	fi
 
 	dosym flex /usr/bin/lex
 }
diff --git a/sys-devel/flex/flex-2.5.4a-r5.ebuild b/sys-devel/flex/flex-2.5.4a-r5.ebuild
index 20ae2dc056b4..32e959566026 100644
--- a/sys-devel/flex/flex-2.5.4a-r5.ebuild
+++ b/sys-devel/flex/flex-2.5.4a-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r5.ebuild,v 1.2 2002/10/16 14:38:27 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r5.ebuild,v 1.3 2002/12/01 23:01:11 seemant Exp $
 
 S="${WORKDIR}/flex-2.5.4"
 DESCRIPTION="GNU lexical analyser generator"
@@ -26,28 +26,28 @@ src_unpack() {
 }
 
 src_compile() {
-    ./configure --prefix=/usr \
+	./configure --prefix=/usr \
 		--host=${CHOST} || die
 
-    if [ -z "`use static`" ]
-    then
-        emake || die
-    else
-        emake LDFLAGS=-static || die
-    fi
+	if [ -z "`use static`" ]
+	then
+		emake || make || die
+	else
+		emake LDFLAGS=-static || die
+	fi
 }
 
 src_install() {
-    make prefix=${D}/usr \
+	make prefix=${D}/usr \
 		mandir=${D}/usr/share/man/man1 \
 		install || die
 	
-    if [ -z "`use build`" ]
-    then
-        dodoc COPYING NEWS README
-    else
-        rm -rf ${D}/usr/share ${D}/usr/include ${D}/usr/lib
-    fi
+	if [ -z "`use build`" ]
+	then
+		dodoc COPYING NEWS README
+	else
+		rm -rf ${D}/usr/share ${D}/usr/include ${D}/usr/lib
+	fi
 
 	dosym flex /usr/bin/lex
 }
-- 
cgit v1.2.3-65-gdbad