From 89aeaf3d144864aac887ae4955fe23d2f9294b6a Mon Sep 17 00:00:00 2001
From: eknauel <eknauel>
Date: Fri, 16 Apr 2004 13:33:24 +0000
Subject: [PATCH] patch to enable building scsh outside its source directory
 (added some missing $(srcdir))

---
 Makefile.in  | 22 +++++++++++++---------
 configure.in | 11 ++++++++++-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index cc5721d..4f080ee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -244,7 +244,7 @@ include $(srcdir)/scsh/machine/Makefile.inc
 
 $(VM): c/main.o $(OBJS) $(UNIX_OBJS) $(LIBOBJS) $(EXTERNAL_OBJECTS)
 	rm -f /tmp/s48_external_$$$$.c &&					\
-	build/build-external-modules /tmp/s48_external_$$$$.c			\
+	$(srcdir)/build/build-external-modules /tmp/s48_external_$$$$.c		\
 		$(EXTERNAL_INITIALIZERS) &&					\
 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ c/main.o $(OBJS) $(UNIX_OBJS)		\
 		/tmp/s48_external_$$$$.c					\
@@ -270,7 +270,7 @@ $(LIBSCSHVM): c/smain.o $(OBJS)
 $(LIBSCSH): $(OBJS) $(UNIX_OBJS) $(LIBOBJS) $(EXTERNAL_OBJECTS)
 	$(RM) $@								\
 	rm -f /tmp/s48_external_$$$$.c &&					\
-	build/build-external-modules /tmp/s48_external_$$$$.c			\
+	$(srcdir)/build/build-external-modules /tmp/s48_external_$$$$.c		\
 		$(EXTERNAL_INITIALIZERS) &&					\
 	$(CC) -c $(CFLAGS) -o  /tmp/s48_external_$$$$.o				\
 			/tmp/s48_external_$$$$.c &&				\
@@ -282,12 +282,12 @@ $(LIBSCSH): $(OBJS) $(UNIX_OBJS) $(LIBOBJS) $(EXTERNAL_OBJECTS)
 c/main.o: c/main.c
 	$(CC) -c $(CFLAGS) -o $@ \
 		-DDEFAULT_IMAGE_NAME=\"$(LIB)/$(IMAGE)\" \
-		$(CPPFLAGS) $(DEFS) c/main.c
+		$(CPPFLAGS) $(DEFS) $(srcdir)/c/main.c
 
 c/init.o: c/init.c c/scheme48vm.h c/scheme48heap.h
 	$(CC) -c $(CFLAGS) -o $@ \
 		-DDEFAULT_IMAGE_NAME=\"$(LIB)/$(IMAGE)\" \
-		$(CPPFLAGS) $(DEFS) c/init.c
+		$(CPPFLAGS) $(DEFS) $(srcdir)/c/init.c
 
 c/scheme48vm.o: c/prescheme.h c/scheme48vm.h c/scheme48heap.h c/event.h \
 			c/io.h c/fd-io.h c/scheme48vm-prelude.h
@@ -314,8 +314,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
-	build/build-usual-image . "`pwd`/scheme" '$(IMAGE)' './$(VM)' \
-		'$(INITIAL)'
+	$(srcdir)/build/build-usual-image $(srcdir) "$(srcdir)/scheme" '$(IMAGE)' './$(VM)' \
+		'$(srcdir)/$(INITIAL)'
 
 ### Fake targets:  all clean install man dist
 
@@ -854,7 +854,7 @@ scsh/scsh: scsh/scsh-tramp.c
 	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) \
 	-DVM=\"$(LIB)/$(VM)\" \
 	-DIMAGE=\"$(LIB)/scsh.image\" \
-	scsh/scsh-tramp.c
+	$(srcdir)/scsh/scsh-tramp.c
 
 bs:	 build/build-scsh-image
 	sh $(srcdir)/build/build-scsh-image "$(srcdir)" "$(LIB)" "$(IMAGE)" \
@@ -872,7 +872,9 @@ opens = floatnums scsh ccp-lib scsh-top-package scsh-here-string-hax \
 
 # Doing ,load-package scheme-with-scsh here gives us much better start-up times
 scsh/scsh.image: $(VM) $(SCHEME) $(IMAGE)
-	(echo ",translate =scheme48/ `pwd`/scheme/"; \
+	(echo ",translate =scheme48/ $(srcdir)/scheme/"; \
+	 echo ",translate $(srcdir)/scsh/endian.scm `pwd`/scsh/endian.scm"; \
+	 echo ",translate $(srcdir)/scsh/configure.scm `pwd`/scsh/configure.scm"; \
 	 echo ",batch on"; \
 	 echo ",config ,load $(loads)"; \
 	 echo ",open $(opens)"; \
@@ -888,7 +890,9 @@ scsh/scsh.image: $(VM) $(SCHEME) $(IMAGE)
 # ,flush => 550k
 scsh/stripped-scsh.image: $(VM) $(SCHEME) $(IMAGE)
 	(echo ",flush maps source";\
-	 echo ",translate =scheme48/ `pwd`/scheme/"; \
+	 echo ",translate =scheme48/ $(srcdir)/scheme/"; \
+	 echo ",translate $(srcdir)/scsh/endian.scm `pwd`/scsh/endian.scm"; \
+	 echo ",translate $(srcdir)/scsh/configure.scm `pwd`/scsh/configure.scm"; \
 	 echo ",batch on"; \
 	 echo ",config ,load $(loads)"; \
 	 echo ",open $(opens)"; \
diff --git a/configure.in b/configure.in
index caf40f0..cb2ae02 100644
--- a/configure.in
+++ b/configure.in
@@ -114,7 +114,7 @@ AC_DEFUN(SCSH_ELF, [
 dnl -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 AC_DEFUN(SCSH_SIG_NRS, [
   AC_MSG_RESULT([defining signal constants])	
-  ${CC} -o scsh_aux scsh/scsh_aux.c
+  ${CC} -o scsh_aux ${srcdir}/scsh/scsh_aux.c
   AC_DEFINE_UNQUOTED(SIGNR_1, `./scsh_aux 1`, [scsh interrupt for signal 1])
   AC_DEFINE_UNQUOTED(SIGNR_2, `./scsh_aux 2`, [scsh interrupt for signal 2])
   AC_DEFINE_UNQUOTED(SIGNR_3, `./scsh_aux 3`, [scsh interrupt for signal 3])
@@ -197,8 +197,17 @@ AC_DEFUN(SCSH_SOCKLEN_T,[
                    AC_DEFINE(socklen_t,int)])])
 ])
 dnl -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+define(SCSH_CREATE_BUILD_DIRS, [dnl
+	mkdir -p cig
+	mkdir -p scsh/machine
+	mkdir -p scsh/rx
+	mkdir -p c/srfi
+	mkdir -p c/unix
+])dnl
+dnl -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 AC_INIT(c/scheme48vm.c)
      AC_CONFIG_HEADER(c/sysdep.h)
+     SCSH_CREATE_BUILD_DIRS
      AC_CANONICAL_HOST
      S48_PROG_CC
      SCSH_SIG_NRS