public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Stefan Schantl <stefan.schantl@ipfire.org>
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	[thread overview]
Message-ID: <20230221100356.597004-1-stefan.schantl@ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1046 bytes --]

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 <stefan.schantl(a)ipfire.org>
---
 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}
-- 
2.30.2


                 reply	other threads:[~2023-02-21 10:03 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230221100356.597004-1-stefan.schantl@ipfire.org \
    --to=stefan.schantl@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox