Date: Tue, 7 Mar 2017 05:10:39 +0000 (UTC) From: "Rodney W. Grimes" <rgrimes@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314833 - in head: bin/pkill lib/libxo/tests/encoder libexec/rtld-elf share/termcap usr.bin/chpass usr.bin/passwd usr.sbin/bsdinstall/partedit usr.sbin/mailwrapper usr.sbin/nologin Message-ID: <201703070510.v275AdYd059917@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rgrimes Date: Tue Mar 7 05:10:38 2017 New Revision: 314833 URL: https://svnweb.freebsd.org/changeset/base/314833 Log: Convert absolute links to relative links. Style.Makefile(9) has been ignored to produce minimal diffs. Approved by: grehan (mentor) MFC after: 1 week Modified: head/bin/pkill/Makefile head/lib/libxo/tests/encoder/Makefile head/libexec/rtld-elf/Makefile head/share/termcap/Makefile head/usr.bin/chpass/Makefile head/usr.bin/passwd/Makefile head/usr.sbin/bsdinstall/partedit/Makefile head/usr.sbin/mailwrapper/Makefile head/usr.sbin/nologin/Makefile Modified: head/bin/pkill/Makefile ============================================================================== --- head/bin/pkill/Makefile Tue Mar 7 04:51:35 2017 (r314832) +++ head/bin/pkill/Makefile Tue Mar 7 05:10:38 2017 (r314833) @@ -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 Modified: head/lib/libxo/tests/encoder/Makefile ============================================================================== --- head/lib/libxo/tests/encoder/Makefile Tue Mar 7 04:51:35 2017 (r314832) +++ head/lib/libxo/tests/encoder/Makefile Tue Mar 7 05:10:38 2017 (r314833) @@ -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 Modified: head/libexec/rtld-elf/Makefile ============================================================================== --- head/libexec/rtld-elf/Makefile Tue Mar 7 04:51:35 2017 (r314832) +++ head/libexec/rtld-elf/Makefile Tue Mar 7 05:10:38 2017 (r314833) @@ -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 Modified: head/share/termcap/Makefile ============================================================================== --- head/share/termcap/Makefile Tue Mar 7 04:51:35 2017 (r314832) +++ head/share/termcap/Makefile Tue Mar 7 05:10:38 2017 (r314833) @@ -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> Modified: head/usr.bin/chpass/Makefile ============================================================================== --- head/usr.bin/chpass/Makefile Tue Mar 7 04:51:35 2017 (r314832) +++ head/usr.bin/chpass/Makefile Tue Mar 7 05:10:38 2017 (r314833) @@ -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 Modified: head/usr.bin/passwd/Makefile ============================================================================== --- head/usr.bin/passwd/Makefile Tue Mar 7 04:51:35 2017 (r314832) +++ head/usr.bin/passwd/Makefile Tue Mar 7 05:10:38 2017 (r314833) @@ -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 Modified: head/usr.sbin/bsdinstall/partedit/Makefile ============================================================================== --- head/usr.sbin/bsdinstall/partedit/Makefile Tue Mar 7 04:51:35 2017 (r314832) +++ head/usr.sbin/bsdinstall/partedit/Makefile Tue Mar 7 05:10:38 2017 (r314833) @@ -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} Modified: head/usr.sbin/mailwrapper/Makefile ============================================================================== --- head/usr.sbin/mailwrapper/Makefile Tue Mar 7 04:51:35 2017 (r314832) +++ head/usr.sbin/mailwrapper/Makefile Tue Mar 7 05:10:38 2017 (r314833) @@ -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" Modified: head/usr.sbin/nologin/Makefile ============================================================================== --- head/usr.sbin/nologin/Makefile Tue Mar 7 04:51:35 2017 (r314832) +++ head/usr.sbin/nologin/Makefile Tue Mar 7 05:10:38 2017 (r314833) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703070510.v275AdYd059917>