[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 010/150] nsis: use "make DESTDIR=" instead of "make prefix="
From: |
Paolo Bonzini |
Subject: |
[PATCH 010/150] nsis: use "make DESTDIR=" instead of "make prefix=" |
Date: |
Mon, 17 Aug 2020 16:35:03 +0200 |
The next patch will prevent modifying the prefix on "make install". Adjust the
creation of the installer.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index f237ff899d..9d9478205c 100644
--- a/Makefile
+++ b/Makefile
@@ -1188,16 +1188,16 @@ installer: $(INSTALLER)
INSTDIR=/tmp/qemu-nsis
-$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi
- $(MAKE) install prefix=${INSTDIR}
+$(INSTALLER): $(SRC_PATH)/qemu.nsi
+ $(MAKE) install DESTDIR=${INSTDIR}
ifdef SIGNCODE
- (cd ${INSTDIR}; \
+ (cd ${INSTDIR}/${bindir}; \
for i in *.exe; do \
$(SIGNCODE) $${i}; \
done \
)
endif # SIGNCODE
- (cd ${INSTDIR}; \
+ (cd ${INSTDIR}/${bindir}; \
for i in qemu-system-*.exe; do \
arch=$${i%.exe}; \
arch=$${arch#qemu-system-}; \
@@ -1206,11 +1206,11 @@ endif # SIGNCODE
echo File \"\$${BINDIR}\\$$i\"; \
echo SectionEnd; \
done \
- ) >${INSTDIR}/system-emulations.nsh
+ ) >${INSTDIR}/${bindir}/system-emulations.nsh
makensis $(nsisflags) \
$(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION="y") \
$(if $(CONFIG_GTK),-DCONFIG_GTK="y") \
- -DBINDIR="${INSTDIR}" \
+ -DBINDIR="${INSTDIR}/${bindir}" \
$(if $(DLL_PATH),-DDLLDIR="$(DLL_PATH)") \
-DSRCDIR="$(SRC_PATH)" \
-DOUTFILE="$(INSTALLER)" \
--
2.26.2
- [PATCH 001/150] oss-fuzz/build: remove LIB_FUZZING_ENGINE, (continued)
- [PATCH 001/150] oss-fuzz/build: remove LIB_FUZZING_ENGINE, Paolo Bonzini, 2020/08/17
- [PATCH 002/150] optionrom: simplify Makefile, Paolo Bonzini, 2020/08/17
- [PATCH 003/150] pc-bios/s390-ccw: do not use rules.mak, Paolo Bonzini, 2020/08/17
- [PATCH 004/150] trace: switch position of headers to what Meson requires, Paolo Bonzini, 2020/08/17
- [PATCH 006/150] build-sys hack: ensure target directory is there, Paolo Bonzini, 2020/08/17
- [PATCH 008/150] tests/vm: check for Python YAML parser in the Makefile, Paolo Bonzini, 2020/08/17
- [PATCH 007/150] tests/vm: do not pollute configure with --efi-aarch64, Paolo Bonzini, 2020/08/17
- [PATCH 005/150] meson: rename .inc.c files to .inc, Paolo Bonzini, 2020/08/17
- [PATCH 009/150] tests/docker: add test script for static linux-user builds, Paolo Bonzini, 2020/08/17
- [PATCH 011/150] configure: do not include $(...) variables in config-host.mak, Paolo Bonzini, 2020/08/17
- [PATCH 010/150] nsis: use "make DESTDIR=" instead of "make prefix=",
Paolo Bonzini <=
- [PATCH 012/150] configure: expand path variables for meson configure, Paolo Bonzini, 2020/08/17
- [PATCH 013/150] configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson, Paolo Bonzini, 2020/08/17
- [PATCH 014/150] tests/vm: include setuptools, Paolo Bonzini, 2020/08/17
- [PATCH 016/150] configure: generate Meson cross file, Paolo Bonzini, 2020/08/17
- [PATCH 017/150] build-sys hack: link with whole .fa archives, Paolo Bonzini, 2020/08/17
- [PATCH 015/150] configure: integrate Meson in the build system, Paolo Bonzini, 2020/08/17
- [PATCH 020/150] meson: enable pie, Paolo Bonzini, 2020/08/17
- [PATCH 018/150] build-sys: add meson submodule, Paolo Bonzini, 2020/08/17
- [PATCH 022/150] meson: add sparse support, Paolo Bonzini, 2020/08/17
- [PATCH 019/150] meson: move summary to meson.build, Paolo Bonzini, 2020/08/17