From cf73c3a04256b4f8d5bf8223f8683dbe5ccf7d00 Mon Sep 17 00:00:00 2001
From: mainzelm <mainzelm>
Date: Thu, 12 Jun 2003 13:08:31 +0000
Subject: [PATCH] Various fixes to support $(srcdir)

---
 Makefile.in | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 9c2f4a8..862ab70 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -300,7 +300,8 @@ c/fake/strerror.o: c/fake/strerror.h
 $(IMAGE): $(VM) scheme/env/init-defpackage.scm scheme/more-interfaces.scm \
 		scheme/link-packages.scm scheme/more-packages.scm \
 		$(usual-files) build/initial.debug build/build-usual-image
-	$(srcdir)/build/build-usual-image $(srcdir) "$(srcdir)/scheme" '$(IMAGE)' './$(VM)' \
+	$(srcdir)/build/build-usual-image $(srcdir) \
+	 "`(cd $(srcdir) && echo $(PWD))`/scheme" '$(IMAGE)' './$(VM)' \
 		'$(INITIAL)'
 
 ### Fake targets:  all clean install man dist
@@ -329,11 +330,11 @@ inst-inc:
 
 inst-misc:
 	for stub in env big opt misc link srfi; do				\
-		for f in scheme/$$stub/*.scm; do			\
+		for f in $(srcdir)/scheme/$$stub/*.scm; do			\
 			$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/$$stub || exit 1;	\
 		done;							\
 	done &&								\
-	for f in scheme/rts/*num.scm scheme/rts/jar-defrecord.scm; do	\
+	for f in $(srcdir)/scheme/rts/*num.scm $(srcdir)/scheme/rts/jar-defrecord.scm; do	\
 		$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/rts || exit 1;	\
 	done 
 
@@ -842,6 +843,7 @@ scsh/scsh.image: $(VM) $(SCHEME) $(IMAGE)
 scsh/stripped-scsh.image: $(VM) $(SCHEME) $(IMAGE)
 	(echo ",flush maps source";\
 	 echo ",translate =scheme48/ `pwd`/scheme/"; \
+	 echo ",translate $(srcdir)/scsh/machine/ $(srcdir)/scsh/@machine@/"; \
 	 echo ",batch on"; \
 	 echo ",config ,load $(loads)"; \
 	 echo ",open $(opens)"; \
@@ -860,12 +862,14 @@ install-scsh: scsh install-scsh-image install-stripped-scsh-image
 
 install-scsh-image: $(VM) scsh/scsh.image
 	(	echo ',translate =scheme48 $(LIB)';			\
+		echo ",translate $(srcdir)/scsh/machine/ $(srcdir)/scsh/@machine@/"; \
 		echo '(dump-scsh "$(DESTDIR)$(LIB)/scsh.image")';	\
 		echo ',exit';						\
 	) | ./$(VM) -i scsh/scsh.image	
 
 install-stripped-scsh-image: $(VM) scsh/stripped-scsh.image
 	(	echo ',translate =scheme48 $(LIB)';			\
+		echo ",translate $(srcdir)/scsh/machine/ $(srcdir)/scsh/@machine@/"; \
 		echo '(dump-scsh "$(DESTDIR)$(LIB)/stripped-scsh.image")';	\
 		echo ',exit';						\
 	) | ./$(VM) -i scsh/stripped-scsh.image