diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/objformat/Makefile | 27 | ||||
| -rw-r--r-- | usr.bin/objformat/objformat.c | 2 |
2 files changed, 11 insertions, 18 deletions
diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile index 279d691..2cc2661 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 <bsd.prog.mk> diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c index d353548..92440d6 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) { |
