From 333cba0accba58b7ca993c9134d6a1d24584c6c7 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 28 Apr 2018 18:13:16 +0200 Subject: [PATCH] Avoid absolute SYMLINKS in cpio(1), tar(1) and mailwrapper(8). --- usr.bin/cpio/Makefile | 2 +- usr.bin/tar/Makefile | 2 +- usr.sbin/mailwrapper/Makefile | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index 29ddd7be98..31b51f4f56 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -13,7 +13,7 @@ CFLAGS+= -I${.CURDIR}/../../lib/libarchive -I${CONTRIBDIR} -I${CONTRIBDIR}/../li CFLAGS+= -DPLATFORM_CONFIG_H=\"config.h\" CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${VERSION}\" -SYMLINKS= ${BINDIR}/bsdcpio ${BINDIR}/cpio +SYMLINKS= bsdcpio ${BINDIR}/cpio MLINKS= bsdcpio.1 cpio.1 .include diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index 3738924a65..a8f9a29399 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -13,7 +13,7 @@ CFLAGS+= -I${.CURDIR}/../../lib/libarchive -I${CONTRIBDIR} -I${CONTRIBDIR}/../li CFLAGS+= -DPLATFORM_CONFIG_H=\"config.h\" CFLAGS+= -DBSDTAR_VERSION_STRING=\"${VERSION}\" -SYMLINKS= ${BINDIR}/bsdtar ${BINDIR}/tar +SYMLINKS= bsdtar ${BINDIR}/tar MLINKS= bsdtar.1 tar.1 .include diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile index f2220b39ba..4052d0de2f 100644 --- a/usr.sbin/mailwrapper/Makefile +++ b/usr.sbin/mailwrapper/Makefile @@ -6,11 +6,11 @@ MAN= mailwrapper.8 DPADD= ${LIBUTIL} LDADD= -lutil -SYMLINKS= ${BINDIR}/mailwrapper /usr/sbin/sendmail \ - ${BINDIR}/mailwrapper /usr/sbin/hoststat \ - ${BINDIR}/mailwrapper /usr/sbin/purgestat \ - ${BINDIR}/mailwrapper /usr/bin/newaliases \ - ${BINDIR}/mailwrapper /usr/bin/mailq +SYMLINKS= mailwrapper ${BINDIR}/sendmail \ + mailwrapper ${BINDIR}/hoststat \ + mailwrapper ${BINDIR}/purgestat \ + ../sbin/mailwrapper /usr/bin/newaliases \ + ../sbin/mailwrapper /usr/bin/mailq afterinstall: .if !exists(${DESTDIR}/etc/mail/mailer.conf) -- 2.11.4.GIT