diff options
| author | Søren Schmidt <sos@FreeBSD.org> | 1998-05-27 07:59:37 +0000 |
|---|---|---|
| committer | Søren Schmidt <sos@FreeBSD.org> | 1998-05-27 07:59:37 +0000 |
| commit | dfd93f4d1d0ead021af3bac3304d66fe68612135 (patch) | |
| tree | 6b4a573a4723c8218828520e4baf555614fd9ddc | |
| parent | 3081c7cd687f477a92c0affcc7543a9e3d13e7ff (diff) | |
| download | src-dfd93f4d1d0ead021af3bac3304d66fe68612135.tar.gz src-dfd93f4d1d0ead021af3bac3304d66fe68612135.zip | |
Compile & use objformat as it was intended to, I have no idea why
that failed for me before :(
Notes
Notes:
svn path=/head/; revision=36408
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/objformat/Makefile | 27 | ||||
| -rw-r--r-- | usr.bin/objformat/objformat.c | 2 |
3 files changed, 13 insertions, 19 deletions
@@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.180 1998/05/25 17:34:34 sos Exp $ +# $Id: Makefile,v 1.181 1998/05/26 20:12:43 sos Exp $ # # While porting to the another architecture include the bootstrap instead # of the normal build. @@ -208,6 +208,7 @@ TMPPATH= ${STRICTTMPPATH}:${PATH} # want that - all compile-time library paths should be resolved by gcc. # It fails for set[ug]id executables (are any used?). COMPILER_ENV= BISON_SIMPLE=${WORLDTMP}/usr/share/misc/bison.simple \ + OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \ COMPILER_PATH=${WORLDTMP}/usr/libexec:${WORLDTMP}/usr/bin \ GCC_EXEC_PREFIX=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib/ \ LD_LIBRARY_PATH=${WORLDTMP}${SHLIBDIR} \ 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 <bsd.prog.mk> 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) { |