summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-04-01 22:54:58 +0000
committerMike Frysinger <vapier@gentoo.org>2005-04-01 22:54:58 +0000
commitcbcaa81a224b63369aad231faa479d0f365123ae (patch)
treeb5b1cb924ef52a41ae6e0e4e20e1e6c2f6a069c4 /sys-devel/m4
parentarm love (diff)
downloadhistorical-cbcaa81a224b63369aad231faa479d0f365123ae.tar.gz
historical-cbcaa81a224b63369aad231faa479d0f365123ae.tar.bz2
historical-cbcaa81a224b63369aad231faa479d0f365123ae.zip
touchup autotools so we can use DESTDIR to install
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-devel/m4')
-rw-r--r--sys-devel/m4/Manifest15
-rw-r--r--sys-devel/m4/files/m4-1.4.3-autotools.patch38
-rw-r--r--sys-devel/m4/m4-1.4.3.ebuild12
3 files changed, 50 insertions, 15 deletions
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 4ca6abd1a2a2..31c52fc92cf2 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 41f63dadf99b787761afe936cdec45cd ChangeLog 4187
-MD5 5bfce1ff38c63be0dad2a82c3a62f345 m4-1.4.3.ebuild 774
-MD5 0a077ae68e101000521f46b2bf974085 m4-1.4.1.ebuild 781
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 0a077ae68e101000521f46b2bf974085 m4-1.4.1.ebuild 781
MD5 daf4440768cb37bd75b092f87042d54c m4-1.4.2-r1.ebuild 762
+MD5 1d40b0259a2ba27c165cbf656a17e187 m4-1.4.3.ebuild 885
MD5 a0fbe19c80ff3efb55bbc711d4ef2648 files/digest-m4-1.4.3 61
MD5 235e74bf79f972d9fe52eaca8532119f files/digest-m4-1.4.1 60
MD5 7703a5bdcc14909f62302b74508db3d3 files/digest-m4-1.4.2-r1 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCTYYQ1ZcsMnZjRyIRAuncAJ9VslpG7BW9rOyth4Az4PhNQrP6iACfb+e0
-zZE5BxfGFkXcwvgffIsLFHE=
-=SJBX
------END PGP SIGNATURE-----
+MD5 1c9901ef77c76aba3f66e96448a12769 files/m4-1.4.3-autotools.patch 913
diff --git a/sys-devel/m4/files/m4-1.4.3-autotools.patch b/sys-devel/m4/files/m4-1.4.3-autotools.patch
new file mode 100644
index 000000000000..9ada27360395
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.3-autotools.patch
@@ -0,0 +1,38 @@
+Use configure options rather than hard coding in Makefiles
+
+--- m4-1.4.3/doc/Makefile.in
++++ m4-1.4.3/doc/Makefile.in
+@@ -27,8 +27,7 @@
+ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+
+-prefix = @prefix@
+-infodir = $(prefix)/info
++infodir = @infodir@
+
+ .SUFFIXES:
+
+--- m4-1.4.3/Makefile.in
++++ m4-1.4.3/Makefile.in
+@@ -40,8 +40,8 @@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = $(exec_prefix)/bin
+-infodir = $(prefix)/info
++bindir = @bindir@
++infodir = @infodir@
+
+ MDEFINES = CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
+ prefix='$(prefix)' exec_prefix='$(exec_prefix)' \
+--- m4-1.4.3/src/Makefile.in
++++ m4-1.4.3/src/Makefile.in
+@@ -35,7 +35,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ transform = @program_transform_name@
+-bindir = $(exec_prefix)/bin
++bindir = @bindir@
+
+ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LINK = $(CC) $(LDFLAGS) -o $@
diff --git a/sys-devel/m4/m4-1.4.3.ebuild b/sys-devel/m4/m4-1.4.3.ebuild
index 3e31c0c3ba86..f51c91a4e880 100644
--- a/sys-devel/m4/m4-1.4.3.ebuild
+++ b/sys-devel/m4/m4-1.4.3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.3.ebuild,v 1.1 2005/04/01 17:30:11 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.3.ebuild,v 1.2 2005/04/01 22:54:58 vapier Exp $
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
DESCRIPTION="GNU macro processor"
HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
@@ -17,6 +17,12 @@ IUSE="nls"
DEPEND="nls? ( sys-devel/gettext )"
RDEPEND=""
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-autotools.patch
+}
+
src_compile() {
econf \
$(use_enable nls) \
@@ -26,6 +32,6 @@ src_compile() {
}
src_install() {
- einstall || die
+ make install DESTDIR="${D}" || die
dodoc BACKLOG ChangeLog NEWS README* THANKS TODO
}