summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVagrant Cascadian <vagrant@reproducible-builds.org>2021-02-22 01:23:34 +0000
committerPaul Gevers <elbrus@debian.org>2022-12-31 22:35:17 +0100
commit5e1884638be0d9832ffa656a1d330474f7de833c (patch)
treea2d1a29030dade9f2bf9f0efc1c5dd7e8a581715
parente15632500581de69771fcae863d9a68613030f73 (diff)
debian/rules: Pass MVDelegate and RMDelegate to configure.
The path to "mv" and "rm" may end up in binaries or documentation, which may be /bin/CMD or /usr/bin/CMD depending on if the running system is a usrmerge system or not. Consistently use /bin/CMD as this is the most compatible path. https://tests.reproducible-builds.org/debian/issues/paths_vary_due_to_usrmerge_issue.html Closes: #983303
-rwxr-xr-xdebian/rules4
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules
index 118f703..cf0a609 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,7 +96,9 @@ STATIC_CONFIGURE_OPTIONS := \
--without-rsvg
CONFIGURE_OPTIONS ?= $(STATIC_CONFIGURE_OPTIONS) \
$(CONFIGURE_OPTIONS_CACHE) \
- $(CONFIGURE_ARCH_FLAGS)
+ $(CONFIGURE_ARCH_FLAGS) \
+ MVDelegate=/bin/mv \
+ RMDelegate=/bin/rm
# export for alternatives
export MAGICK_PROGRAMS := compare animate convert composite conjure import identify stream display montage mogrify