From dfd93f4d1d0ead021af3bac3304d66fe68612135 Mon Sep 17 00:00:00 2001 From: Søren Schmidt Date: Wed, 27 May 1998 07:59:37 +0000 Subject: Compile & use objformat as it was intended to, I have no idea why that failed for me before :( --- usr.bin/objformat/Makefile | 27 ++++++++++----------------- usr.bin/objformat/objformat.c | 2 +- 2 files changed, 11 insertions(+), 18 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile index 279d6911e11c..2cc266105bb6 100644 --- a/usr.bin/objformat/Makefile +++ b/usr.bin/objformat/Makefile @@ -2,28 +2,21 @@ PROG= objformat NOMAN= not yet -CFLAGS+= -DMAIN -DROOTDIR=\"${DESTDIR}/usr/libexec/\" +CFLAGS+= -DMAIN + .if ${BINFORMAT} == elf CFLAGS+= -DFREEBSD_ELF .else CFLAGS+= -DFREEBSD_AOUT .endif -objformat: - @echo Compiles on install. - -install: - $(CC) ${CFLAGS} ${.CURDIR}/objformat.c -o ${DESTDIR}/usr/bin/objformat - chown ${BINOWN} ${DESTDIR}/usr/bin/objformat - chgrp ${BINGRP} ${DESTDIR}/usr/bin/objformat - chmod ${BINMODE} ${DESTDIR}/usr/bin/objformat - ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/ar - ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/as - ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/ld - ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/nm - ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/ranlib - ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/size - ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/strings - ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/strip +LINKS+= /usr/bin/objformat /usr/bin/ar +LINKS+= /usr/bin/objformat /usr/bin/as +LINKS+= /usr/bin/objformat /usr/bin/ld +LINKS+= /usr/bin/objformat /usr/bin/nm +LINKS+= /usr/bin/objformat /usr/bin/ranlib +LINKS+= /usr/bin/objformat /usr/bin/size +LINKS+= /usr/bin/objformat /usr/bin/strings +LINKS+= /usr/bin/objformat /usr/bin/strip .include diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c index d3535480582e..92440d642637 100644 --- a/usr.bin/objformat/objformat.c +++ b/usr.bin/objformat/objformat.c @@ -138,7 +138,7 @@ main(int argc, char **argv) /* 'make world' glue */ objformat_path = getenv("OBJFORMAT_PATH"); if (objformat_path == NULL) - objformat_path = ROOTDIR; + objformat_path = "/usr/libexec"; path = strdup(objformat_path); if (objformat_aout) { -- cgit v1.3