commit c4f9f4dce1736727f2cee789c95ea2d3b9b5a5ec
parent dd2d158752e4144e373e7f7025b0b4126b98afa6
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Mon, 28 Oct 2024 10:32:19 +0100
build: Fix install and uninstall targets
Diffstat:
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/main.mk b/main.mk
@@ -22,11 +22,11 @@ config: FORCE
install: all
$(SCRIPTDIR)/install $(ROOT)
- +@$(MAKE) install-`uname -m`
+ +@$(MAKE) -f main.mk install-$(ARCH)
uninstall:
$(SCRIPTDIR)/uninstall $(ROOT)
- +@$(MAKE) uninstall-`uname -m`
+ +@$(MAKE) -f main.mk uninstall-$(ARCH)
toolchain: src
libc: src/libc
diff --git a/scripts/proto.all b/scripts/proto.all
@@ -183,8 +183,8 @@ d 755 libexec/scc
f 755 libexec/scc/as-amd64
f 755 libexec/scc/as-i286
f 755 libexec/scc/as-i386
-f 755 libexec/scc/as-powerpc
-f 755 libexec/scc/as-powerpc64
+f 755 libexec/scc/as-ppc
+f 755 libexec/scc/as-ppc64
f 755 libexec/scc/as-z80
f 755 libexec/scc/cc1
f 755 libexec/scc/cc2-amd64-sysv
@@ -192,4 +192,3 @@ f 755 libexec/scc/cc2-i386-sysv
f 755 libexec/scc/cc2-qbe_amd64-sysv
f 755 libexec/scc/cc2-qbe_arm64-sysv
f 755 libexec/scc/cc2-z80-scc
-f 755 libexec/scc/qbe