Date: Mon, 6 Mar 2017 21:29:34 -0800 (PST) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> Cc: "Rodney W. Grimes" <rgrimes@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: 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: <201703070529.v275TYnT092593@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <21A8D529-BFB9-4774-83FB-5CABD2BC689C@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
-- Start of PGP signed section. > > > On Mar 6, 2017, at 21:10, Rodney W. Grimes <rgrimes@FreeBSD.org> wrote: > > > > 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 > > This change breaks setting TESTSBASE != /usr/tests . Please fix (my employer depends on this being functional). That well happen when I resolve the SYMLINKS .mk glue that should probalby be calling INSTALL_RSYMLINKS and not INSTALL_SYMLINKS. For now this was the minimal diff that corrected the contents of DESTDIR. I did not get a response from either Bdrewery or Bapt on my direct question about the issue that SYMLINKS has no relative mechansim, other than we could add a RSYMLINKS possibly. > Thanks, > -Ngie -- End of PGP section, PGP failed! -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703070529.v275TYnT092593>