diff options
| -rw-r--r-- | bin/pkill/Makefile | 4 | ||||
| -rw-r--r-- | libexec/rtld-elf/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/chpass/Makefile | 10 | ||||
| -rw-r--r-- | usr.bin/passwd/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/bsdinstall/partedit/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/mailwrapper/Makefile | 14 | ||||
| -rw-r--r-- | usr.sbin/nologin/Makefile | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile index 2eb3ede..302ac66 100644 --- a/bin/pkill/Makefile +++ b/bin/pkill/Makefile @@ -16,8 +16,8 @@ MLINKS= pkill.1 pgrep.1 # keep in mind that pkill is installed to /usr/bin in other # OS types, e.g., NetBSD, OpenBSD, Solaris, and Linux. # -SYMLINKS= ${BINDIR}/pkill /usr/bin/pkill -SYMLINKS+= ${BINDIR}/pgrep /usr/bin/pgrep +SYMLINKS= ../..${BINDIR}/pkill /usr/bin/pkill +SYMLINKS+= ../..${BINDIR}/pgrep /usr/bin/pgrep .if ${MK_TESTS} != "no" SUBDIR+= tests diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 7efe2f2..01ccace 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -34,7 +34,7 @@ WARNS?= 2 INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec -SYMLINKS= ${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG} +SYMLINKS= ../..${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG} MLINKS= rtld.1 ld-elf.so.1.1 \ rtld.1 ld.so.1 diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index 16974e2..266ca5a 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -22,12 +22,12 @@ LIBADD= crypt util LIBADD+= ypclnt .endif -SYMLINKS= ${BINDIR}/chpass ${BINDIR}/chfn -SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/chsh +SYMLINKS= chpass ${BINDIR}/chfn +SYMLINKS+= chpass ${BINDIR}/chsh .if ${MK_NIS} != "no" -SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/ypchpass -SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/ypchfn -SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/ypchsh +SYMLINKS+= chpass ${BINDIR}/ypchfn +SYMLINKS+= chpass ${BINDIR}/ypchpass +SYMLINKS+= chpass ${BINDIR}/ypchsh .endif MLINKS= chpass.1 chfn.1 chpass.1 chsh.1 diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index fac1bb1..1ec051f 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -9,7 +9,7 @@ BINMODE = 4555 PRECIOUSPROG= LIBADD = pam .if ${MK_NIS} != "no" -SYMLINKS = ${BINDIR}/passwd ${BINDIR}/yppasswd +SYMLINKS = passwd ${BINDIR}/yppasswd MLINKS = passwd.1 yppasswd.1 .endif diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile index 21d842e..7d8f065 100644 --- a/usr.sbin/bsdinstall/partedit/Makefile +++ b/usr.sbin/bsdinstall/partedit/Makefile @@ -4,7 +4,7 @@ BINDIR= ${LIBEXECDIR}/bsdinstall PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart -SYMLINKS= ${BINDIR}/partedit /usr/sbin/sade +SYMLINKS= ../libexec/bsdinstall/partedit /usr/sbin/sade LIBADD+= geom ncursesw util dialog m PARTEDIT_ARCH= ${MACHINE} diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile index 584cab8..5500356 100644 --- a/usr.sbin/mailwrapper/Makefile +++ b/usr.sbin/mailwrapper/Makefile @@ -10,19 +10,19 @@ LIBADD= util .endif .if ${MK_MAILWRAPPER} != "no" || ${MK_SENDMAIL} != "no" -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= ../sbin/mailwrapper /usr/bin/mailq \ + ../sbin/mailwrapper /usr/bin/newaliases \ + mailwrapper /usr/sbin/hoststat \ + mailwrapper /usr/sbin/purgestat \ + mailwrapper /usr/sbin/sendmail .if ${MK_MAILWRAPPER} == "no" && ${MK_SENDMAIL} != "no" -SYMLINKS+= /usr/libexec/sendmail/sendmail ${BINDIR}/mailwrapper +SYMLINKS+= ../libexec/sendmail/sendmail ${BINDIR}/mailwrapper .endif .endif .if ${MK_MAILWRAPPER} != "no" && ${MK_SENDMAIL} == "no" -SYMLINKS+= ${BINDIR}/mailwrapper /bin/rmail +SYMLINKS+= ..${BINDIR}/mailwrapper /bin/rmail .endif .if ${MK_MAILWRAPPER} != "no" diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile index 0b4c0db..d743f60 100644 --- a/usr.sbin/nologin/Makefile +++ b/usr.sbin/nologin/Makefile @@ -4,7 +4,7 @@ PROG= nologin MAN= nologin.5 nologin.8 -SYMLINKS= ${BINDIR}/nologin /sbin/nologin +SYMLINKS= ..${BINDIR}/nologin /sbin/nologin # It is important that nologin be statically linked for security # reasons. A dynamic non-setuid binary can be linked against a trojan |
