diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-10 15:23:28 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-21 06:18:36 -0400 |
| commit | 1b00a4c476a32d1e2ffa16ce56141640358306be (patch) | |
| tree | 4351c79e76e290d0d3c08f914168b97b60479527 | |
| parent | b861f59593cf8f45cd2a7fd8f6122835566ad64d (diff) | |
| download | qemu-1b00a4c476a32d1e2ffa16ce56141640358306be.zip qemu-1b00a4c476a32d1e2ffa16ce56141640358306be.tar.gz qemu-1b00a4c476a32d1e2ffa16ce56141640358306be.tar.bz2 | |
nsis: use "make DESTDIR=" instead of "make prefix="
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>
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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)" \ |