Pet check-plist. (I thought this was fixed by r354246 but looks like

that commit only handles the pkgng case not pkg_*...)

Submitted by:	jenkins via swills
This commit is contained in:
Juergen Lock 2014-05-20 15:57:31 +00:00
parent 4069d6aaa7
commit d4b92c1491
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=354652
2 changed files with 2 additions and 18 deletions

View file

@ -295,12 +295,8 @@ post-install:
.endif
@${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
@${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
@if [ ! -f ${PREFIX}/etc/qemu-ifup ]; then \
${CP} -p ${STAGEDIR}${PREFIX}/etc/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc/qemu-ifup ; \
fi
@if [ ! -f ${PREFIX}/etc/qemu-ifdown ]; then \
${CP} -p ${STAGEDIR}${PREFIX}/etc/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc/qemu-ifdown ; \
fi
@(cd ${STAGEDIR}${PREFIX}/etc/qemu && \
${MV} -i target-x86_64.conf target-x86_64.conf.sample)
.endif
.include <bsd.port.mk>

View file

@ -23,15 +23,3 @@
ifdef CONFIG_POSIX
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
@@ -341,7 +347,10 @@
$(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)"
install-sysconfig: install-datadir install-confdir
- $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
+ $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)/target-x86_64.conf.sample"
+ if [ ! -f "$(qemu_confdir)/target-x86_64.conf" ]; then \
+ $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"; \
+ fi
install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
install-datadir install-localstatedir