[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v8 011/152] nsis: use "make DESTDIR=" instead of "make prefix="
From: |
Paolo Bonzini |
Subject: |
[PULL v8 011/152] nsis: use "make DESTDIR=" instead of "make prefix=" |
Date: |
Fri, 21 Aug 2020 06:21:08 -0400 |
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 5596482dbd..ec12101a84 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
- [PULL v8 001/152] oss-fuzz/build: remove LIB_FUZZING_ENGINE, (continued)
- [PULL v8 001/152] oss-fuzz/build: remove LIB_FUZZING_ENGINE, Paolo Bonzini, 2020/08/21
- [PULL v8 007/152] build-sys hack: ensure target directory is there, Paolo Bonzini, 2020/08/21
- [PULL v8 006/152] meson: rename .inc.h files to .h.inc, Paolo Bonzini, 2020/08/21
- [PULL v8 003/152] pc-bios/s390-ccw: do not use rules.mak, Paolo Bonzini, 2020/08/21
- [PULL v8 008/152] tests/vm: do not pollute configure with --efi-aarch64, Paolo Bonzini, 2020/08/21
- [PULL v8 002/152] optionrom: simplify Makefile, Paolo Bonzini, 2020/08/21
- [PULL v8 004/152] trace: switch position of headers to what Meson requires, Paolo Bonzini, 2020/08/21
- [PULL v8 010/152] tests/docker: add test script for static linux-user builds, Paolo Bonzini, 2020/08/21
- [PULL v8 005/152] meson: rename included C source files to .c.inc, Paolo Bonzini, 2020/08/21
- [PULL v8 012/152] configure: do not include $(...) variables in config-host.mak, Paolo Bonzini, 2020/08/21
- [PULL v8 011/152] nsis: use "make DESTDIR=" instead of "make prefix=",
Paolo Bonzini <=
- [PULL v8 009/152] tests/vm: check for Python YAML parser in the Makefile, Paolo Bonzini, 2020/08/21
- [PULL v8 013/152] configure: expand path variables for meson configure, Paolo Bonzini, 2020/08/21
- [PULL v8 015/152] tests/vm: include setuptools, Paolo Bonzini, 2020/08/21
- [PULL v8 016/152] configure: add support for pseudo-"in source tree" builds, Paolo Bonzini, 2020/08/21
- [PULL v8 014/152] configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 019/152] build-sys hack: link with whole .fa archives, Paolo Bonzini, 2020/08/21
- [PULL v8 018/152] configure: generate Meson cross file, Paolo Bonzini, 2020/08/21
- [PULL v8 022/152] meson: enable pie, Paolo Bonzini, 2020/08/21
- [PULL v8 021/152] meson: move summary to meson.build, Paolo Bonzini, 2020/08/21
- [PULL v8 020/152] build-sys: add meson submodule, Paolo Bonzini, 2020/08/21