Merge. Fix LINKS+= with $DESTDIR$BINDIR in them, you do NOT need to
specify $DESTDIR on a LINKS+= line.
This commit is contained in:
parent
6d36c167f4
commit
6a8b6e6f01
@ -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
|
||||
|
@ -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} \
|
||||
|
Loading…
x
Reference in New Issue
Block a user