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>
This commit is contained in:
Paolo Bonzini 2020-08-10 15:23:28 +02:00
parent b861f59593
commit 1b00a4c476

View file

@ -1188,16 +1188,16 @@ installer: $(INSTALLER)
INSTDIR=/tmp/qemu-nsis INSTDIR=/tmp/qemu-nsis
$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi $(INSTALLER): $(SRC_PATH)/qemu.nsi
$(MAKE) install prefix=${INSTDIR} $(MAKE) install DESTDIR=${INSTDIR}
ifdef SIGNCODE ifdef SIGNCODE
(cd ${INSTDIR}; \ (cd ${INSTDIR}/${bindir}; \
for i in *.exe; do \ for i in *.exe; do \
$(SIGNCODE) $${i}; \ $(SIGNCODE) $${i}; \
done \ done \
) )
endif # SIGNCODE endif # SIGNCODE
(cd ${INSTDIR}; \ (cd ${INSTDIR}/${bindir}; \
for i in qemu-system-*.exe; do \ for i in qemu-system-*.exe; do \
arch=$${i%.exe}; \ arch=$${i%.exe}; \
arch=$${arch#qemu-system-}; \ arch=$${arch#qemu-system-}; \
@ -1206,11 +1206,11 @@ endif # SIGNCODE
echo File \"\$${BINDIR}\\$$i\"; \ echo File \"\$${BINDIR}\\$$i\"; \
echo SectionEnd; \ echo SectionEnd; \
done \ done \
) >${INSTDIR}/system-emulations.nsh ) >${INSTDIR}/${bindir}/system-emulations.nsh
makensis $(nsisflags) \ makensis $(nsisflags) \
$(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION="y") \ $(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION="y") \
$(if $(CONFIG_GTK),-DCONFIG_GTK="y") \ $(if $(CONFIG_GTK),-DCONFIG_GTK="y") \
-DBINDIR="${INSTDIR}" \ -DBINDIR="${INSTDIR}/${bindir}" \
$(if $(DLL_PATH),-DDLLDIR="$(DLL_PATH)") \ $(if $(DLL_PATH),-DDLLDIR="$(DLL_PATH)") \
-DSRCDIR="$(SRC_PATH)" \ -DSRCDIR="$(SRC_PATH)" \
-DOUTFILE="$(INSTALLER)" \ -DOUTFILE="$(INSTALLER)" \