aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Bushnell <tb@debian.org>2008-01-13 22:15:05 -0500
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:39 -0800
commitf4724a372f685cc5487ed083a9311a8d05600ddc (patch)
treea7df779e60dc6ab0b174bd3eb1de508af84ff737
parent184a6ac199a512beca8b6bee1c9fd42ca23879eb (diff)
downloadscm-f4724a372f685cc5487ed083a9311a8d05600ddc.zip
scm-f4724a372f685cc5487ed083a9311a8d05600ddc.tar.gz
Import Debian changes 5e4-4debian/5e4-4
scm (5e4-4) unstable; urgency=low * continue.h: Fix spelling of STACK_GROWS_UP in change from 5e4-1. * Makefile: Repeat change from 5e3-2.
-rw-r--r--Makefile4
-rw-r--r--continue.h2
-rw-r--r--debian/changelog8
3 files changed, 12 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1f01857..32bcea6 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,9 @@ ufiles = pre-crt0.c ecrt0.c gmalloc.c unexec.c unexelf.c unexhp9k800.c \
# unexnext.c unexnt.c unexsgi.c unexsni.c unexsunos4.c
ofiles = scm.o time.o repl.o scl.o sys.o eval.o subr.o unif.o rope.o \
continue.o findexec.o script.o debug.o
-# continue-ia64.o
+ifeq ($(ARCH),ia64)
+ofiles += continue-ia64.o
+endif
ifiles = Init$(VERSION).scm Transcen.scm Link.scm Macro.scm Macexp.scm \
Tscript.scm compile.scm Iedline.scm Idiffer.scm
hobfiles = hobbit.scm scmhob.scm scmhob.h
diff --git a/continue.h b/continue.h
index 45d7e96..d6c8f3c 100644
--- a/continue.h
+++ b/continue.h
@@ -85,7 +85,7 @@ typedef long STACKITEM;
# define STACK_GROWS_UP
#endif
#ifdef __hppa__
-# define STACK_GROW_UP
+# define STACK_GROWS_UP
#endif
/* James Clark came up with this neat one instruction fix for
diff --git a/debian/changelog b/debian/changelog
index 8c2525d..d7586db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scm (5e4-4) unstable; urgency=low
+
+ * continue.h: Fix spelling of STACK_GROWS_UP in change from 5e4-1.
+
+ * Makefile: Repeat change from 5e3-2.
+
+ -- Thomas Bushnell, BSG <tb@debian.org> Sun, 13 Jan 2008 22:15:05 -0500
+
scm (5e4-3) unstable; urgency=low
* debian/rules (SCM_OPTIONS): Add -F differ.