diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-14 13:25:15 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-14 13:25:15 +0000 |
| commit | d2ddc7b1eb41133f10dc1c28474bee26c5230c02 (patch) | |
| tree | bfc7009765bbd5b743f54afd5163453291a176ac /sys-apps/gawk | |
| parent | Should have been keyworded with ~x86 only in first place, sorry. (Manifest re... (diff) | |
| download | gentoo-2-d2ddc7b1eb41133f10dc1c28474bee26c5230c02.tar.gz gentoo-2-d2ddc7b1eb41133f10dc1c28474bee26c5230c02.tar.bz2 gentoo-2-d2ddc7b1eb41133f10dc1c28474bee26c5230c02.zip | |
multilib fixes for filefuncs.
(Portage version: 2.0.51-r12)
Diffstat (limited to 'sys-apps/gawk')
| -rw-r--r-- | sys-apps/gawk/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/gawk/files/filefuncs/Makefile | 14 | ||||
| -rw-r--r-- | sys-apps/gawk/gawk-3.1.3-r2.ebuild | 3 | ||||
| -rw-r--r-- | sys-apps/gawk/gawk-3.1.4.ebuild | 3 |
4 files changed, 17 insertions, 9 deletions
diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog index eed42bf9d6f7..eb674b7cb169 100644 --- a/sys-apps/gawk/ChangeLog +++ b/sys-apps/gawk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/gawk # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.48 2005/01/12 18:27:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.49 2005/01/14 13:25:15 eradicator Exp $ + + 14 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + files/filefuncs/Makefile, gawk-3.1.3-r2.ebuild, gawk-3.1.4.ebuild: + multilib fixes for filefuncs. *gawk-3.1.4 (12 Jan 2005) diff --git a/sys-apps/gawk/files/filefuncs/Makefile b/sys-apps/gawk/files/filefuncs/Makefile index 8358fb72c6ea..785b481500de 100644 --- a/sys-apps/gawk/files/filefuncs/Makefile +++ b/sys-apps/gawk/files/filefuncs/Makefile @@ -1,7 +1,7 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/Makefile,v 1.4 2004/07/15 00:42:04 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/Makefile,v 1.5 2005/01/14 13:25:15 eradicator Exp $ CC ?= gcc LD = $(CC) @@ -14,6 +14,8 @@ DESTDIR = TARGET = filefuncs.so.$(MAJORVER).$(MINORVER) +LIBDIR = lib + all: $(TARGET) filefuncs.o: filefuncs.c @@ -23,11 +25,11 @@ filefuncs.so.$(MAJORVER).$(MINORVER): filefuncs.o $(LD) -o $@ -shared -Wl,-soname -Wl,filefuncs.so.$(MAJORVER) $^ install: $(TARGET) - install -m 0755 -d $(DESTDIR)/lib/rcscripts - install -m 0755 $(TARGET) $(DESTDIR)/lib/rcscripts - ldconfig -l $(DESTDIR)/lib/rcscripts/$(TARGET) - rm -f $(DESTDIR)/lib/rcscripts/filefuncs.so - ln -s $(TARGET) $(DESTDIR)/lib/rcscripts/filefuncs.so + install -m 0755 -d $(DESTDIR)/$(LIBDIR)/rcscripts + install -m 0755 $(TARGET) $(DESTDIR)/$(LIBDIR)/rcscripts + ldconfig -l $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET) + rm -f $(DESTDIR)/$(LIBDIR)/rcscripts/filefuncs.so + ln -s $(TARGET) $(DESTDIR)/$(LIBDIR)/rcscripts/filefuncs.so clean: rm -f $(TARGET) diff --git a/sys-apps/gawk/gawk-3.1.3-r2.ebuild b/sys-apps/gawk/gawk-3.1.3-r2.ebuild index 922c449965c0..dc65496e5c3d 100644 --- a/sys-apps/gawk/gawk-3.1.3-r2.ebuild +++ b/sys-apps/gawk/gawk-3.1.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r2.ebuild,v 1.2 2005/01/12 18:27:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r2.ebuild,v 1.3 2005/01/14 13:25:15 eradicator Exp $ inherit eutils toolchain-funcs @@ -43,6 +43,7 @@ src_install() { make \ DESTDIR=${D} \ AWKINCDIR=${S} \ + LIBDIR="$(get_libdir)" \ install || die "filefuncs install failed" dodir /usr/bin diff --git a/sys-apps/gawk/gawk-3.1.4.ebuild b/sys-apps/gawk/gawk-3.1.4.ebuild index a99edfc59130..156ef83d9091 100644 --- a/sys-apps/gawk/gawk-3.1.4.ebuild +++ b/sys-apps/gawk/gawk-3.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.4.ebuild,v 1.1 2005/01/12 18:27:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.4.ebuild,v 1.2 2005/01/14 13:25:15 eradicator Exp $ inherit eutils toolchain-funcs @@ -42,6 +42,7 @@ src_install() { make \ DESTDIR="${D}" \ AWKINCDIR="${S}" \ + LIBDIR="$(get_libdir)" \ install \ || die "filefuncs install failed" |