diff options
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/qemu-devel/Makefile | 8 | ||||
| -rw-r--r-- | emulators/qemu-devel/files/patch-Makefile | 12 |
2 files changed, 2 insertions, 18 deletions
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index f0300695724b..cb46aebbfb58 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -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> diff --git a/emulators/qemu-devel/files/patch-Makefile b/emulators/qemu-devel/files/patch-Makefile index f9fc530ea762..ec67d45dc178 100644 --- a/emulators/qemu-devel/files/patch-Makefile +++ b/emulators/qemu-devel/files/patch-Makefile @@ -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 |