diff options
| author | rgrimes <rgrimes@FreeBSD.org> | 1993-07-16 17:48:38 +0000 |
|---|---|---|
| committer | rgrimes <rgrimes@FreeBSD.org> | 1993-07-16 17:48:38 +0000 |
| commit | e700287fa6959afe91114e83da22a0613aea4f34 (patch) | |
| tree | a07ebf79b1de158688ba052c063564efa80ae1c8 /gnu | |
| parent | 04e9d836aed7e9404d71215827943b8f46fe1e6c (diff) | |
| download | FreeBSD-src-e700287fa6959afe91114e83da22a0613aea4f34.zip FreeBSD-src-e700287fa6959afe91114e83da22a0613aea4f34.tar.gz | |
Merge. Fix LINKS+= with $DESTDIR$BINDIR in them, you do NOT need to
specify $DESTDIR on a LINKS+= line.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/grep/Makefile | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/gzip/Makefile | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile index 45e664f..c8d4915 100644 --- a/gnu/usr.bin/grep/Makefile +++ b/gnu/usr.bin/grep/Makefile @@ -4,8 +4,8 @@ CFLAGS+=-DGREP -DHAVE_STRING_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_UNISTD_H=1 \ -DHAVE_GETPAGESIZE=1 -DHAVE_MEMCHR=1 -DHAVE_STRERROR=1 \ -DHAVE_VALLOC=1 -LINKS+= ${DESTDIR}${BINDIR}/grep ${DESTDIR}${BINDIR}/egrep \ - ${DESTDIR}${BINDIR}/grep ${DESTDIR}${BINDIR}/fgrep +LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \ + ${BINDIR}/grep ${BINDIR}/fgrep MLINKS= grep.1 egrep.1 grep.1 fgrep.1 check: all diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile index 7a5d303..368e218 100644 --- a/gnu/usr.bin/gzip/Makefile +++ b/gnu/usr.bin/gzip/Makefile @@ -6,9 +6,9 @@ SRCS= gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \ MAN1= gzexe.1 gzip.1 zdiff.1 zforce.1 zmore.1 znew.1 CFLAGS+=-DASMV -DHAVE_UNISTD_H=1 -DDIRENT=1 MLINKS= gzip.1 gunzip.1 gzip.1 zcat.1 gzip.1 gzcat.1 -LINKS+= ${DESTDIR}${BINDIR}/gzip ${DESTDIR}${BINDIR}/gunzip -LINKS+= ${DESTDIR}${BINDIR}/gzip ${DESTDIR}${BINDIR}/gzcat -LINKS+= ${DESTDIR}${BINDIR}/gzip ${DESTDIR}${BINDIR}/zcat +LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip +LINKS+= ${BINDIR}/gzip ${BINDIR}/gzcat +LINKS+= ${BINDIR}/gzip ${BINDIR}/zcat afterinstall: install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
