diff options
| author |   Achim Gottinger <achim@gentoo.org> | 2001-02-27 12:34:52 +0000 |
|---|---|---|
| committer | Achim Gottinger <achim@gentoo.org> | 2001-02-27 12:34:52 +0000 |
| commit | 8f117744d10ad46c802184845c1bc6db966d8367 (patch) | |
| tree | 3257a68b3a4abcb0f85c6ee211f2582de3641678 /sys-devel/bin86 | |
| parent | *** empty log message *** (diff) | |
| download | gentoo-2-8f117744d10ad46c802184845c1bc6db966d8367.tar.gz gentoo-2-8f117744d10ad46c802184845c1bc6db966d8367.tar.bz2 gentoo-2-8f117744d10ad46c802184845c1bc6db966d8367.zip | |
Patching makefile instaed of using sed's for building
Diffstat (limited to 'sys-devel/bin86')
| -rw-r--r-- | sys-devel/bin86/bin86-0.15.4-r1.ebuild | 12 | ||||
| -rw-r--r-- | sys-devel/bin86/files/bin86-0.15.4-Makefile-gentoo.diff | 49 |
2 files changed, 52 insertions, 9 deletions
diff --git a/sys-devel/bin86/bin86-0.15.4-r1.ebuild b/sys-devel/bin86/bin86-0.15.4-r1.ebuild index b6f0f326b40c..e9e7e89f65bc 100644 --- a/sys-devel/bin86/bin86-0.15.4-r1.ebuild +++ b/sys-devel/bin86/bin86-0.15.4-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.15.4-r1.ebuild,v 1.1 2001/02/07 16:05:19 achim Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.15.4-r1.ebuild,v 1.2 2001/02/27 12:34:52 achim Exp $ A=${P}.tar.gz S=${WORKDIR}/bin86 @@ -14,11 +14,7 @@ src_unpack() { unpack ${A} cd ${S} - cp Makefile Makefile.orig - sed -e "s/CFLAGS=-O2/CFLAGS=${CFLAGS}/" \ - -e "s:INSTALL_OPTS=-m 755 -s:INSTALL_OPTS=-m 755:" \ - Makefile.orig > Makefile - + patch -p0 < ${FILESDIR}/bin86-0.15.4-Makefile-gentoo.diff } src_compile() { @@ -29,9 +25,7 @@ src_compile() { src_install() { - dodir /usr/bin - dodir /usr/share/man/man1 - try make PREFIX=${D}/usr MANDIR=${D}/usr/share/man/man1 install + try make DESTDIR=${D} install dodoc README README-0.4 ChangeLog docinto as diff --git a/sys-devel/bin86/files/bin86-0.15.4-Makefile-gentoo.diff b/sys-devel/bin86/files/bin86-0.15.4-Makefile-gentoo.diff new file mode 100644 index 000000000000..4345eb8fcd6c --- /dev/null +++ b/sys-devel/bin86/files/bin86-0.15.4-Makefile-gentoo.diff @@ -0,0 +1,49 @@ +--- Makefile.orig Tue Feb 27 14:27:10 2001 ++++ Makefile Tue Feb 27 14:27:11 2001 +@@ -1,15 +1,17 @@ + +-CFLAGS=-O2 -D_POSIX_SOURCE ++CFLAGS+=-D_POSIX_SOURCE + LDFLAGS= + DIRS=ld as + +-PREFIX=/usr/local ++PREFIX=/usr + BINDIR=$(PREFIX)/bin + LIBDIR=$(PREFIX)/lib +-MANDIR=$(PREFIX)/man/man1 ++MANDIR=$(PREFIX)/share/man/man1 + SUF=86 + +-INSTALL_OPTS=-m 755 -s ++DESTDIR= ++ ++INSTALL_OPTS=-m 755 + MAN_OPTS =-m 644 + + MFLAGS= "LIBS=$(LIBS)" \ +@@ -25,14 +27,16 @@ + done + + install: all +- install $(INSTALL_OPTS) as/as86 $(BINDIR)/as$(SUF) +- install $(INSTALL_OPTS) as/as86_encap $(BINDIR)/as$(SUF)_encap +- install $(INSTALL_OPTS) ld/ld86 $(BINDIR)/ld$(SUF) +- install $(INSTALL_OPTS) ld/objdump86 $(BINDIR)/objdump$(SUF) +- install $(MAN_OPTS) man/*.1 $(MANDIR) +- ln -sf objdump$(SUF) $(BINDIR)/nm$(SUF) +- ln -sf objdump$(SUF) $(BINDIR)/size$(SUF) +- ln -sf as86.1 $(MANDIR)/as86_encap.1 ++ install $(INSTALL_OPTS) -d $(DESTDIR)/$(BINDIR) ++ install $(INSTALL_OPTS) -d $(DESTDIR)/$(MANDIR) ++ install $(INSTALL_OPTS) as/as86 $(DESTDIR)/$(BINDIR)/as$(SUF) ++ install $(INSTALL_OPTS) as/as86_encap $(DESTDIR)/$(BINDIR)/as$(SUF)_encap ++ install $(INSTALL_OPTS) ld/ld86 $(DESTDIR)/$(BINDIR)/ld$(SUF) ++ install $(INSTALL_OPTS) ld/objdump86 $(DESTDIR)/$(BINDIR)/objdump$(SUF) ++ install $(MAN_OPTS) man/*.1 $(DESTDIR)/$(MANDIR) ++ ln -sf objdump$(SUF) $(DESTDIR)/$(BINDIR)/nm$(SUF) ++ ln -sf objdump$(SUF) $(DESTDIR)/$(BINDIR)/size$(SUF) ++ ln -sf as86.1 $(DESTDIR)/$(MANDIR)/as86_encap.1 + + depend clean clobber: + set -e ; for d in $(DIRS); do \ |