--- trunk/mage/Makefile	2012/01/03 20:18:51	1606
+++ trunk/mage/Makefile	2023/07/31 10:53:22	3192
@@ -1,19 +1,40 @@
 # 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)
-
-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
+VERSION = $(shell cat VERSION)
+ARCH = $(shell arch)
+ifeq ($(ARCH), )
+	ARCH := $(shell uname -m)
+endif
+
+
+ABI_X86_64_CHOST = x86_64-pc-linux-gnu
+ABI_X86_CHOST = i686-pc-linux-gnu
+
+ifeq ($(ARCH), x86_64)
+	MARCH = x86-64
+	ABI_DEFAULT_LIBDIR = lib
+	ABI_X86_64_LIBDIR = lib
+	ABI_X86_LIBDIR = lib32
+	ABI_DEFAULT_CHOST = $(ABI_X86_64_CHOST)
+else
+	MARCH = $(ARCH)
+	ABI_DEFAULT_LIBDIR = lib
+	ABI_X86_64_LIBDIR = lib
+	ABI_X86_LIBDIR = lib
+	ABI_DEFAULT_CHOST = $(ABI_X86_CHOST)
+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
 
 all: install
 
@@ -31,11 +52,19 @@
 	install -m 0755 $(srclib)/depwalker.sh $(DESTDIR)$(libdir)
 	install -m 0755 $(srclib)/env-rebuild.sh $(DESTDIR)$(libdir)
 	install -m 0755 $(srclib)/etc-update $(DESTDIR)$(libdir)
-	install -m 0755 $(srclib)/ldd-fix.sh $(DESTDIR)$(libdir)
 	install -m 0644 $(srclib)/mage4.functions.sh $(DESTDIR)$(libdir)
 	install -m 0755 $(srclib)/mage4.sh $(DESTDIR)$(libdir)
 	install -m 0755 $(srclib)/magequery.sh $(DESTDIR)$(libdir)
-	sed "s:@@ARCH@@:$(ARCH):" $(srclib)/mage.rc.global.in \
+	sed -e "s:@@ARCH@@:$(ARCH):g" \
+		-e "s:@@MTUNE@@:$(MTUNE):g" \
+		-e "s:@@MARCH@@:$(MARCH):g" \
+		-e "s:@@MAGE_ABI_DEFAULT_LIBDIR@@:$(MAGE_ABI_DEFAULT_LIBDIR):g" \
+		-e "s:@@MAGE_ABI_X86_LIBDIR@@:$(MAGE_ABI_X86_LIBDIR):g" \
+		-e "s:@@MAGE_ABI_X86_64_LIBDIR@@:$(MAGE_ABI_X86_64_LIBDIR):g" \
+		-e "s:@@ABI_DEFAULT_CHOST@@:$(ABI_DEFAULT_CHOST):g" \
+		-e "s:@@ABI_X86_64_CHOST@@:$(ABI_X86_64_CHOST):g" \
+		-e "s:@@ABI_X86_CHOST@@:$(ABI_X86_CHOST):g" \
+		$(srclib)/mage.rc.global.in \
 		> $(DESTDIR)$(libdir)/mage.rc.global
 	install -m 0755 $(srclib)/mgroupadd $(DESTDIR)$(libdir)
 	install -m 0755 $(srclib)/mgroupdel $(DESTDIR)$(libdir)
@@ -44,10 +73,17 @@
 	install -m 0755 $(srclib)/muserdel $(DESTDIR)$(libdir)
 	install -m 0755 $(srclib)/pkgbuild_dir.sh $(DESTDIR)$(libdir)
 	install -m 0755 $(srclib)/smage2.sh $(DESTDIR)$(libdir)
+	install -m 0644 $(srclib)/smage2.functions.sh $(DESTDIR)$(libdir)
 	install -m 0644 $(srcdoc)/template.{mage,smage2} $(DESTDIR)$(datadir)
 	install -m 0644 $(srcdir)/ChangeLog $(DESTDIR)$(datadir)
 	echo "$(VERSION)" > $(DESTDIR)$(libdir)/version
 
+	# include some useful scripts
+	install -m 0755 $(srclib)/ldd-fix.sh $(DESTDIR)$(libdir)
+	install -m 0755 $(srclib)/pkg_all_sources.sh $(DESTDIR)$(libdir)
+	install -m 0755 $(srclib)/autodepend.sh $(DESTDIR)$(libdir)
+	install -m 0755 $(srclib)/search_soname.sh $(DESTDIR)$(libdir)
+
 install-symlinks:
 	ln -snf $(libdir)/mage4.sh $(DESTDIR)$(sbindir)/mage
 	ln -snf $(libdir)/smage2.sh $(DESTDIR)$(sbindir)/smage2