# HG changeset patch
# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
# Date 1678122147 -3600
#      Mon Mar 06 18:02:27 2023 +0100
# Branch stable
# Node ID 506edb8dbf983280ec1f7a7635eb8d4931422666
# Parent  a070a7c3dbf8d0c6b5085785d6ffa0206f1622ce
# EXP-Topic patches
makefile

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ build:
 	$(PYTHON) setup.py $(PURE) build $(COMPILERFLAG)
 
 build-chg:
-	make -C contrib/chg
+	$(MAKE) -C contrib/chg
 
 build-rhg:
 	(cd rust/rhg; cargo build --release)
@@ -100,10 +100,10 @@ clean: cleanbutpackages
 install: install-bin install-doc
 
 install-bin: build
-	$(PYTHON) setup.py $(PURE) install --root="$(DESTDIR)/" --prefix="$(PREFIX)" --force
+	$(PYTHON) setup.py $(PURE) install --root="$(DESTDIR)/" --force
 
 install-chg: build-chg
-	make -C contrib/chg install PREFIX="$(PREFIX)"
+	$(MAKE) -C contrib/chg install PREFIX="$(PREFIX)"
 
 install-doc: doc
 	cd doc && $(MAKE) $(MFLAGS) install
@@ -117,7 +117,7 @@ install-home-doc: doc
 	cd doc && $(MAKE) $(MFLAGS) PREFIX="$(HOME)" install
 
 install-rhg: build-rhg
-	install -m 755 rust/target/release/rhg "$(PREFIX)"/bin/
+	install -m 755 rust/target/$(CARGO_BUILD_TARGET)/release/rhg "$(DESTDIR)$(PREFIX)"/bin/
 
 MANIFEST-doc:
 	$(MAKE) -C doc MANIFEST
@@ -238,11 +238,11 @@ osx:
 	/usr/bin/python2.7 setup.py install --optimize=1 \
 	  --root=build/mercurial/ --prefix=/usr/local/ \
 	  --install-lib=/Library/Python/2.7/site-packages/
-	make -C doc all install DESTDIR="$(PWD)/build/mercurial/"
+	$(MAKE) -C doc all install DESTDIR="$(PWD)/build/mercurial/"
         # Place a bogon .DS_Store file in the target dir so we can be
         # sure it doesn't get included in the final package.
 	touch build/mercurial/.DS_Store
-	make -C contrib/chg \
+	$(MAKE) -C contrib/chg \
 	  HGPATH=/usr/local/bin/hg \
 	  PYTHON=/usr/bin/python2.7 \
 	  DESTDIR=../../build/mercurial \