From nobody Mon Feb 9 23:58:14 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597682960; cv=none; d=zohomail.com; s=zohoarc; b=eOlcgalGBjiKkk2TqChjY1fAlhxHnQ3vXLDUeQr+9GXrg2/vxanp67keAfDWGM30J3yZ1A/rrKvb4QmqLMYapqECSQsXQiUiUwCddORl3kLgdsoGt52dzeUjS8q9PQe2OdLCx+Q+4EuDv/NuVkGpgl2/a1/IwuAoCr/oK51UoyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682960; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l47U03HezxiRa34Hi3q2A5qZxOmUpp0uisa6/2TcHYQ=; b=PZdorL7NHjTT34JllxEPeMmpka2X1NdkViXO3au04tBhflIhcxL1GY0G/jbasxiG2b1ZO50N+J+4ZBKnrfPZyZGh5n+aM37VSfcmjeEnLTK7uY34QU15Fz4tMrhhmGRiIHLH2Ob3ME9OX6Y5l7HB6dO5Z2DNvVMbM5K+1Mf10Q0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597682960925415.9988685546749; Mon, 17 Aug 2020 09:49:20 -0700 (PDT) Received: from localhost ([::1]:37980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gLY-0003n1-RB for importer@patchew.org; Mon, 17 Aug 2020 10:42:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGa-0003DF-1S for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:40 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38576) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGY-00062L-Fq for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:39 -0400 Received: by mail-wm1-x343.google.com with SMTP id t14so14085328wmi.3 for ; Mon, 17 Aug 2020 07:37:38 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l47U03HezxiRa34Hi3q2A5qZxOmUpp0uisa6/2TcHYQ=; b=lQZfoWPjHU4Pjkx4oZ6oS78TUARb4S8WhEQBh+bEPzB88gP+rlXUGn7IFL5TsYXW8+ uIYqtZoeZmbJ50So+/jdCPitt5qX+mRLA8kBGo1KnN15sOHFCiKtApKPbyILfdS3jwMl J55wY3Jvzo62YZzddpMe8LltqCi+Hg9INQQTZKAdaMRxgkLFzvvIXvLHjvhJCwv9GHsX eqJd+9GsNViwwsT18KSFqA3jeDBOPDxiNauDo5dNE7W8yunCpKCo9lGd1xKjfwAMB20N zGZD88d3/16MqyAz0HR7BNtRExfdgorprk0WIe6rmPEbwAXq7pI+ZfuPI2rzHom8JEJ8 a+OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=l47U03HezxiRa34Hi3q2A5qZxOmUpp0uisa6/2TcHYQ=; b=T86s+L18HuyRhErHMBnbQ6dVZxdlWJJ2pknV9IAgHTU2V8TOslet6UUSyEZkoyZrIL 3nxSCqkvsn73J+7PwkLxrLG21tfmFsdFu6zlIRGJSEQUyGn0ggroAXXrba4pxyliXIr/ bfNhZOZYrWQvYVFfSmEDEn9PBLdyy9ZrxocB6YQ81/xTfw4W6cGsQeakBFaKJ8+fd+OK TCQSYg459ZzvSGjCIykOUPh36ToK5f6mduXx06vEj+ngyBpb6HAcp4zaStWoLV/ZE05F QYucBtBBsmHJt+/jaCeWCXdiqjh3qHWsxVPh6R07yIKdoZVlVwsi4hHQfNEU+Txe72Uj K/4w== X-Gm-Message-State: AOAM530Y+me/vHqG7rhk8Cy+0ZCLzas5Z7t1X4x83npCWgVK7uCZLWto R+WjE+fUJS1bf7Ljf5phJwvPq/8d0NI= X-Google-Smtp-Source: ABdhPJwsZxR3X4qAX6yMpe+ZrUqaryN81A5Oq9RyhsVStuCn7Lo7CoPuwHXE4H4RNZlvEHNOOWaD7g== X-Received: by 2002:a1c:a553:: with SMTP id o80mr14677459wme.50.1597675056907; Mon, 17 Aug 2020 07:37:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 010/150] nsis: use "make DESTDIR=" instead of "make prefix=" Date: Mon, 17 Aug 2020 16:35:03 +0200 Message-Id: <20200817143723.343284-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The next patch will prevent modifying the prefix on "make install". Adjust= the creation of the installer. Signed-off-by: Paolo Bonzini --- 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) =20 INSTDIR=3D/tmp/qemu-nsis =20 -$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi - $(MAKE) install prefix=3D${INSTDIR} +$(INSTALLER): $(SRC_PATH)/qemu.nsi + $(MAKE) install DESTDIR=3D${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=3D$${i%.exe}; \ arch=3D$${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=3D"y") \ $(if $(CONFIG_GTK),-DCONFIG_GTK=3D"y") \ - -DBINDIR=3D"${INSTDIR}" \ + -DBINDIR=3D"${INSTDIR}/${bindir}" \ $(if $(DLL_PATH),-DDLLDIR=3D"$(DLL_PATH)") \ -DSRCDIR=3D"$(SRC_PATH)" \ -DOUTFILE=3D"$(INSTALLER)" \ --=20 2.26.2