diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1998-08-28 22:46:03 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1998-08-28 22:46:03 +0000 |
| commit | 5b07739fd599e083b91b99fa8ac605fa448954af (patch) | |
| tree | 93f6e6febab20d0992ba95461908429fd7ac2646 | |
| parent | 6f40ebd3811e80c4d150d762959c9055a61184bd (diff) | |
fix cross-lib install
| -rw-r--r-- | Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 1998/05/18 18:29:07 mickey Exp $ +# $OpenBSD: Makefile,v 1.39 1998/08/28 22:46:02 mickey Exp $ # # For more information on building in tricky environments, please see @@ -138,7 +138,7 @@ cross-binutils-new: /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \ --prefix ${CROSSDIR}/usr \ --target `cat ${CROSSDIR}/TARGET_CANON` && \ - ${MAKE} && ${MAKE} install) + ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} DESTDIR=${CROSSDIR} install) ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \ ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \ ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder @@ -310,12 +310,13 @@ cross-lib: (cd $$lib; \ ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} NOMAN=; \ - DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - ${MAKE} NOMAN= install); \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + DESTDIR=${CROSSDIR} ${MAKE} NOMAN= install); \ done; \ ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ - MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \ - SKIPDIR=libocurses/PSD.doc ${MAKE} NOMAN= install) + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \ + ${MAKE} NOMAN= install) ln -sf ${CROSSDIR}/usr/lib \ ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib |