diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2014-07-16 15:18:36 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2014-07-16 15:18:36 +0000 |
| commit | c12f633b56018b553fcb53dae33416f54b6760db (patch) | |
| tree | 23507478149729bd9dec2f818a07d173da6b0660 | |
| parent | 56489ca4cc653adb269ef2bdfbefba6cd3dcc4c4 (diff) | |
prefer ln -f over rm + ln
OK deraadt
| -rw-r--r-- | etc/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/etc/Makefile b/etc/Makefile index ec0cf44d190..3e44b511088 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.382 2014/07/16 14:34:33 okan Exp $ +# $OpenBSD: Makefile,v 1.383 2014/07/16 15:18:35 okan Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -186,10 +186,8 @@ distribution-etc-root-var: distrib-dirs ${DESTDIR}/var/named/standard/loopback; \ ${INSTALL} -c -o root -g wheel -m 644 db.loopback6.arpa \ ${DESTDIR}/var/named/standard/loopback6.arpa - /bin/rm -f ${DESTDIR}/etc/localtime - ln -s ${TZDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime - /bin/rm -f ${DESTDIR}/etc/rmt - ln -s /usr/sbin/rmt ${DESTDIR}/etc/rmt + ln -fs ${TZDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime + ln -fs /usr/sbin/rmt ${DESTDIR}/etc/rmt ${INSTALL} -c -o root -g wheel -m 644 minfree \ ${DESTDIR}/var/crash ${INSTALL} -c -o ${BINOWN} -g operator -m 664 /dev/null \ @@ -270,7 +268,7 @@ distrib-dirs: if [ ! -d ${DESTDIR}/usr/src ]; then \ ${INSTALL} -d -o root -g wsrc -m 775 ${DESTDIR}/usr/src; \ fi - cd ${DESTDIR}/; rm -f sys; ln -s usr/src/sys sys + cd ${DESTDIR}/; ln -fhs usr/src/sys sys .ifndef RELEASEDIR release: |