diff options
author | brooks <brooks@FreeBSD.org> | 2013-01-17 23:05:03 +0000 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2013-01-17 23:05:03 +0000 |
commit | 2ba8b9706f72629013ae0e5b0cac03cff0c58eb8 (patch) | |
tree | abd76ff659cd2c73c7a95f6b58cdf46fdae0aa5e | |
parent | a7ae12540950e997186b1f262c93a2ad1da3af30 (diff) | |
download | FreeBSD-src-2ba8b9706f72629013ae0e5b0cac03cff0c58eb8.zip FreeBSD-src-2ba8b9706f72629013ae0e5b0cac03cff0c58eb8.tar.gz |
In r245571, "rm -rf <foo>; ln -s <bar> <foo>" needed to be replaced with
"ln -sfh <bar> <foo>" or the links would fail when a valid link to a
directly was in place at <foo>.
Reported by: peter
Tested by: peter
Pointy hat to: brooks
-rw-r--r-- | etc/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/etc/Makefile b/etc/Makefile index 5053762..e8f8291 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -324,26 +324,26 @@ distrib-dirs: -f $$m -p $$d; \ ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \ done; true - ln -sf usr/src/sys ${DESTDIR}/sys + ln -sfh usr/src/sys ${DESTDIR}/sys cd ${DESTDIR}/usr/share/man; \ for mandir in man*; do \ - ln -sf ../$$mandir ${DESTDIR}/usr/share/man/en.ISO8859-1/; \ - ln -sf ../$$mandir ${DESTDIR}/usr/share/man/en.UTF-8/; \ + ln -sfh ../$$mandir ${DESTDIR}/usr/share/man/en.ISO8859-1/; \ + ln -sfh ../$$mandir ${DESTDIR}/usr/share/man/en.UTF-8/; \ done cd ${DESTDIR}/usr/share/openssl/man; \ for mandir in man*; do \ - ln -sf ../$$mandir \ + ln -sfh ../$$mandir \ ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \ done set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \ while [ $$# -gt 0 ] ; do \ - ln -sf "$$2" "${DESTDIR}/usr/share/man/$$1"; \ - ln -sf "$$2" "${DESTDIR}/usr/share/openssl/man/$$1"; \ + ln -sfh "$$2" "${DESTDIR}/usr/share/man/$$1"; \ + ln -sfh "$$2" "${DESTDIR}/usr/share/openssl/man/$$1"; \ shift; shift; \ done set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ while [ $$# -gt 0 ] ; do \ - ln -sf "$$2" "${DESTDIR}/usr/share/nls/$$1"; \ + ln -sfh "$$2" "${DESTDIR}/usr/share/nls/$$1"; \ shift; shift; \ done |