From patchwork Tue Feb 21 10:03:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 6574 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PLZd26Rxmz3x1t for ; Tue, 21 Feb 2023 10:04:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PLZd15TK3zlx; Tue, 21 Feb 2023 10:04:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PLZd14SWZz2yTc; Tue, 21 Feb 2023 10:04:05 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PLZcz5QQgz2xSJ; Tue, 21 Feb 2023 10:04:03 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PLZcz06LYzRR; Tue, 21 Feb 2023 10:04:02 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1676973843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=bhyWfuJLfdXkFtwWm1yIJB/Qj50mArVixqs4XE2hZhI=; b=jzqfP0t5Vzdu5mhHQRO6Fl/4ICsmARPzpqL80Rp2SV/T0bQs24vbPg+iEVmIAhzawBqx50 rmG6PA1JM3uq7VAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1676973843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=bhyWfuJLfdXkFtwWm1yIJB/Qj50mArVixqs4XE2hZhI=; b=e1cLaBHewhCuOwEsrcwhjL/mOROUEZ0tgGtZSWd5AnO3okXEHYlhui8wFgUvcjGPSjnoUV /aGKNVHBlEyo8vD+Ju3yvDQRGzF4EoLnNmjVczWu5a0ufIsN+p63lqMl60j44zOX8M3ugF gNWC6g4/Zyofrrq+w3wj7Fm/+Atzr5p4qLCBW0VccaQT8K8lZo2Hcn3SIgYJtEwEZYkY+W SUyZ7j8btuQe59Bb39/82HS03ouBy65DWd/zw/dDQwdiUjIu7kJOxwGjjmJuS5mWM5EV/B I0qUbU1W+GazFmGpE4t9RJ59HrK2fxJKnEiehU9Jr43jpsiZWF5RvhI44GDjqg== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH] build.macro: Explicitly call make install in the install section. Date: Tue, 21 Feb 2023 11:03:56 +0100 Message-Id: <20230221100356.597004-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pakfire@lists.ipfire.org Errors-To: development-bounces@lists.ipfire.org Sender: "Development" When using the make_install_targets value in a build file, this value got overwritten by the given one. This mean the "install" value got lost, except you have specified it again in your custom make_install_targets. This is not very intuitive at all and leads to aborted builds, missing files etc. Signed-off-by: Stefan Schantl --- macros/build.macro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macros/build.macro b/macros/build.macro index 36c8fa03..dbb55213 100644 --- a/macros/build.macro +++ b/macros/build.macro @@ -162,7 +162,7 @@ build # These variables are used if you have to add some targets # directly to the make command. make_build_targets = - make_install_targets = install + make_install_targets = def _prepare rm -rf %{BUILDROOT}/* @@ -245,7 +245,7 @@ build end def install - make DESTDIR=%{BUILDROOT} %{make_install_targets} + make DESTDIR=%{BUILDROOT} %{make_install_targets} install # Run custom commands. %{install_cmds}