From b6fa723b20fab0d8e7970d5beaa152d0c9e1b4b4 Mon Sep 17 00:00:00 2001
From: Thomas Bushnell <tb@debian.org>
Date: Thu, 26 Oct 2006 21:50:09 -0700
Subject: Import Debian changes 5e3-2

scm (5e3-2) unstable; urgency=low

  * Makefile (ofiles): If $(ARCH) is ia64, add continue-ia64.o.
  * debian/rules: Set ARCH from DEB_BUILD_ARCH when making scmlit.
  (Closes: #395312)
---
 debian/changelog | 8 ++++++++
 debian/rules     | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 5be7a7f..c631754 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scm (5e3-2) unstable; urgency=low
+
+  * Makefile (ofiles): If $(ARCH) is ia64, add continue-ia64.o.
+  * debian/rules: Set ARCH from DEB_BUILD_ARCH when making scmlit.
+  (Closes: #395312)
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Thu, 26 Oct 2006 21:50:09 -0700
+
 scm (5e3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 763f2a2..d5ea1e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,9 +62,9 @@ build-stamp:
 	dh_testdir
 	cp debian/require.scm.debian require.scm
 ifeq ($(DEB_BUILD_ARCH), m68k)
-	${MAKE} scmlit CFLAGS="-g -Wall"
+	${MAKE} scmlit CFLAGS="-g -Wall" ARCH=$(DEB_BUILD_ARCH)
 else
-	${MAKE} scmlit
+	${MAKE} scmlit ARCH=$(DEB_BUILD_ARCH)
 endif
 	test -e /usr/share/slib || \
 	  (echo "Must have slib installed for compile" && exit 1)
-- 
cgit v1.2.3