binutils: Offer both readelf(1)'s based on BINUTILSVER's setting.
authorSascha Wildner <saw@online.de>
Sat, 19 Mar 2011 15:57:27 +0000 (16:57 +0100)
committerSascha Wildner <saw@online.de>
Sat, 19 Mar 2011 15:57:27 +0000 (16:57 +0100)
Reported-by: John Marino <john@marino.st>
gnu/usr.bin/binutils217/readelf/Makefile
gnu/usr.bin/binutils220/readelf/Makefile
usr.bin/objformat/Makefile
usr.bin/objformat/objformat.c

index 3073984..f10b001 100644 (file)
@@ -1,14 +1,8 @@
-# $DragonFly: src/gnu/usr.bin/binutils217/readelf/Makefile,v 1.1 2007/04/13 12:24:33 corecode Exp $
-
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
-# No a.out vs. ELF version so don't install in /usr/libexec/elf
-BINDIR=/usr/bin
-
 PROG=  readelf
-SRCS=  ${PROG}.c
 WARNS= 1
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd -I${.OBJDIR}/../libbfd
index f229387..956019f 100644 (file)
@@ -2,9 +2,6 @@
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
-# No a.out vs. ELF version so don't install in /usr/libexec/elf
-BINDIR=/usr/bin
-
 PROG=  readelf
 WARNS= 1
 
index c4e8487..536f578 100644 (file)
@@ -1,5 +1,4 @@
 # $FreeBSD: src/usr.bin/objformat/Makefile,v 1.15 1999/12/24 15:18:19 green Exp $
-# $DragonFly: src/usr.bin/objformat/Makefile,v 1.13 2008/05/14 15:02:48 hasso Exp $
 
 PROG=          objformat
 NOSHARED?=     YES
@@ -30,6 +29,7 @@ LINKS+=       ${BINDIR}/objformat ${BINDIR}/nm
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/objcopy
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/objdump
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/ranlib
+LINKS+=        ${BINDIR}/objformat ${BINDIR}/readelf
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/size
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/strings
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/strip
index c7a95e2..61b094e 100644 (file)
@@ -77,6 +77,7 @@ static struct command commands[] = {
        {"objcopy",     BINUTILS2},
        {"objdump",     BINUTILS2},
        {"ranlib",      BINUTILS2},
+       {"readelf",     BINUTILS2},
        {"size",        BINUTILS2},
        {"strings",     BINUTILS2},
        {"strip",       BINUTILS2},