summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1995-12-27 10:42:08 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1995-12-27 10:42:08 +0000
commit02965e5ba76a288ead18e450766197893d5a91da (patch)
tree22ff18f228d4c614781b089f2be354add12c3047
parent1f93e978db8af006a445eac5092de3b49a8bc737 (diff)
Support LDSTATIC and BINDIR
-rw-r--r--gnu/usr.bin/cvs/Makefile.bsd-wrapper6
-rw-r--r--gnu/usr.bin/gcc/Makefile.bsd-wrapper8
-rw-r--r--gnu/usr.bin/texinfo/Makefile.bsd-wrapper8
3 files changed, 11 insertions, 11 deletions
diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
index 6029fb2c91b..d179bd6c5c6 100644
--- a/gnu/usr.bin/cvs/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
@@ -1,9 +1,9 @@
-# $Id: Makefile.bsd-wrapper,v 1.5 1995/12/20 18:39:20 deraadt Exp $
+# $Id: Makefile.bsd-wrapper,v 1.6 1995/12/27 10:41:22 niklas Exp $
MAN= man/cvs.1 man/cvs.5 man/cvsbug.8 man/cvsinit.8 man/mkmodules.1
all: config.status
- ${MAKE}
+ ${MAKE} LDFLAGS=${LDSTATIC}
.FORCE: .IGNORE
@@ -15,7 +15,7 @@ config.status:
install: maninstall
${MAKE} prefix=${DESTDIR}/usr infodir=${DESTDIR}/usr/share/info \
- INSTALL_MAN= install
+ bindir=${DESTDIR}${BINDIR} INSTALL_MAN= install
clean cleandir:
-@if [ -e Makefile ]; then ${MAKE} realclean; fi
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index 005e7be83c5..be04dfe2329 100644
--- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
@@ -1,10 +1,10 @@
-# $Id: Makefile.bsd-wrapper,v 1.1 1995/12/21 01:16:07 niklas Exp $
+# $Id: Makefile.bsd-wrapper,v 1.2 1995/12/27 10:41:48 niklas Exp $
MAN= cccp.1 gcc.1 cp/g++.1
MLINKS= gcc.1 cc.1
all: config.status
- ${MAKE} BISON=yacc
+ ${MAKE} BISON=yacc LDFLAGS=${LDSTATIC}
.FORCE: .IGNORE
@@ -19,8 +19,8 @@ config.status:
install: maninstall
${MAKE} prefix=${DESTDIR}/usr infodir=${DESTDIR}/usr/share/info \
tooldir=/tmp assertdir=/tmp INSTALL_MAN= NO_TARGET_GCC=true \
- install
- ln -f ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc
+ bindir=${DESTDIR}${BINDIR} install
+ ln -f ${DESTDIR}${BINDIR}/gcc ${DESTDIR}${BINDIR}/cc
clean cleandir:
-@if [ -e Makefile ]; then ${MAKE} distclean; fi
diff --git a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
index c763ec0cda3..f1722168563 100644
--- a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
@@ -1,11 +1,11 @@
-# $Id: Makefile.bsd-wrapper,v 1.1 1995/12/22 18:12:36 niklas Exp $
+# $Id: Makefile.bsd-wrapper,v 1.2 1995/12/27 10:42:07 niklas Exp $
MAN= info/info.1
SUBDIRS= libtxi makeinfo info util
FSFMAKE= ${MAKE} SUBDIRS="$(SUBDIRS)"
all: config.status
- ${FSFMAKE}
+ ${FSFMAKE} LDFLAGS=${LDSTATIC}
.FORCE: .IGNORE
@@ -16,8 +16,8 @@ config.status:
/bin/sh ${.CURDIR}/configure --prefix=/usr
install: maninstall
- ${FSFMAKE} prefix=${DESTDIR}/usr infodir=${DESTDIR}/usr/share/info \
- mandir= INSTALL_MAN= install
+ ${FSFMAKE} prefix=${DESTDIR}/usr bindir=${DESTDIR}${BINDIR} \
+ infodir=${DESTDIR}/usr/share/info mandir= INSTALL_MAN= install
clean cleandir:
-@if [ -e Makefile ]; then ${FSFMAKE} distclean; fi