--- trunk/mage/Makefile	2013/10/16 07:51:30	2226
+++ trunk/mage/Makefile	2017/08/01 12:29:08	3048
@@ -1,15 +1,15 @@
 # Magellan Package Management
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/Makefile,v 1.3 2007-11-05 19:36:36 niro Exp $
+# $Id$
 
-DESTDIR =
 VERSION = $(shell cat VERSION)
-ARCH = $(shell uname -m)
+ARCH = $(shell arch)
 
 ifeq ($(ARCH), x86_64)
-	MTUNE = generic
+	MARCH = x86-64
 else
-	MTUNE = $(ARCH)
+	MARCH = $(ARCH)
 endif
+MTUNE = generic
 
 sysconfdir = /etc
 libdir = /usr/lib/mage
@@ -42,6 +42,7 @@
 	install -m 0755 $(srclib)/magequery.sh $(DESTDIR)$(libdir)
 	sed -e "s:@@ARCH@@:$(ARCH):g" \
 		-e "s:@@MTUNE@@:$(MTUNE):g" \
+		-e "s:@@MARCH@@:$(MARCH):g" \
 		$(srclib)/mage.rc.global.in \
 		> $(DESTDIR)$(libdir)/mage.rc.global
 	install -m 0755 $(srclib)/mgroupadd $(DESTDIR)$(libdir)