Skip to content

Commit

Permalink
Convert absolute links to relative links.
Browse files Browse the repository at this point in the history 
Style.Makefile(9) has been ignored to produce minimal diffs.

Approved by:	grehan (mentor)
MFC after:	1 week
  • Loading branch information
@rwgbsd
rwgbsd committed Mar 7, 2017
1 parent ef1d40d commit ce9f2d3
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions bin/pkill/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/libxo/tests/encoder/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SHLIB_NAME= libenc_test.so

LIBDIR= ${TESTSBASE}/lib/libxo

SYMLINKS+= ${LIBDIR}/${SHLIB_NAME} /usr/lib/libxo/encoder/test.enc
SYMLINKS+= ../../../tests/lib/libxo/${SHLIB_NAME} /usr/lib/libxo/encoder/test.enc

SRCS= enc_test.c

Expand Down
2 changes: 1 addition & 1 deletion libexec/rtld-elf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion share/termcap/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ termcap.db: termcap
cap_mkdb ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC}

etc-termcap:
${INSTALL_SYMLINK} ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
${INSTALL_RSYMLINK} ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap

.include <bsd.prog.mk>
10 changes: 5 additions & 5 deletions usr.bin/chpass/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion usr.bin/passwd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion usr.sbin/bsdinstall/partedit/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
14 changes: 7 additions & 7 deletions usr.sbin/mailwrapper/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion usr.sbin/nologin/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ce9f2d3

Please sign in to comment.