--- trunk/mage/Makefile	2012/02/06 10:02:33	1678
+++ tags/mage-0_4_114/Makefile	2018/06/05 10:36:34	3100
@@ -1,25 +1,25 @@
 # 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)
+VERSION = $(shell cat VERSION)
+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
-sbindir=/sbin
-datadir=/usr/share/doc/mage-$(VERSION)
-
-srcdir=.
-srclib=$(srcdir)/usr/lib/mage
-srcdoc=$(srcdir)/usr/share/doc/mage
-srcetc=$(srcdir)/etc
+sysconfdir = /etc
+libdir = /usr/lib/mage
+sbindir = /sbin
+datadir = /usr/share/doc/mage-$(VERSION)
+
+srcdir = .
+srclib = $(srcdir)/usr/lib/mage
+srcdoc = $(srcdir)/usr/share/doc/mage
+srcetc = $(srcdir)/etc
 
 all: install
 
@@ -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)