PERFORCE change 122165 for review
Peter Wemm
peter at FreeBSD.org
Fri Jun 22 19:03:33 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=122165
Change 122165 by peter at peter_daintree on 2007/06/22 19:03:15
Attempt to recover from makefile reordering
Affected files ...
.. //depot/projects/hammer/etc/Makefile#54 edit
Differences ...
==== //depot/projects/hammer/etc/Makefile#54 (text+ko) ====
@@ -130,6 +130,23 @@
.if ${MK_I4B} != "no"
cd ${.CURDIR}/isdn; ${MAKE} install
.endif
+.if ${MK_BIND_ETC} != "no"
+.if defined(NO_BIND_CHROOT)
+ cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${NAMEDB} ${DESTDIR}/etc/namedb
+.else
+ cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${NAMEDB} ${DESTDIR}/var/named/etc/namedb
+.endif
+.endif
+.if !defined(NO_BIND_CHROOT)
+.if ${MK_BIND_MTREE} != "no"
+ @if [ ! -e ${DESTDIR}/etc/namedb ]; then \
+ set -x; \
+ ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
+ fi
+.endif
+.endif
.if ${MK_SENDMAIL} != "no"
cd ${.CURDIR}/sendmail; ${MAKE} distribution
.endif
@@ -158,23 +175,6 @@
ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${MTREE} ${DESTDIR}/etc/mtree
-.if ${MK_BIND_ETC} != "no"
-.if defined(NO_BIND_CHROOT)
- cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- ${NAMEDB} ${DESTDIR}/etc/namedb
-.else
- cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- ${NAMEDB} ${DESTDIR}/var/named/etc/namedb
-.endif
-.endif
-.if !defined(NO_BIND_CHROOT)
-.if ${MK_BIND_MTREE} != "no"
- @if [ ! -e ${DESTDIR}/etc/namedb ]; then \
- set -x; \
- ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
- fi
-.endif
-.endif
cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
${PPPCNF} ${DESTDIR}/etc/ppp
cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
More information about the p4-projects
mailing list