From 9938c1a7103f96604e5e826cbf7152cda1f815cb Mon Sep 17 00:00:00 2001
From: marting <marting>
Date: Fri, 12 Nov 1999 15:33:17 +0000
Subject: [PATCH] adaped to the original scsh structure

---
 Makefile.in | 49 +++++++++++++++++++------------------------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0af7879..18e425a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,8 +19,8 @@ LIBOBJS = @LIBOBJS@
 
 RM	= rm -f
 
-AR	= ar cq
-RANLIB	= ranlib
+AR	= @AR@
+RANLIB	= @RANLIB@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -44,7 +44,7 @@ mandir = $(prefix)/man/man$(manext)
 	$(CC) -g -c $(CPPFLAGS) $(DEFS) -I$(srcdir)/c -I$(srcdir)/cig $(CFLAGS) -o $@ $<
 
 # You might want to change RUNNABLE to "s48"
-RUNNABLE = scsh06
+RUNNABLE = scsh
 MANPAGE = $(RUNNABLE).$(manext)
 LIB = $(libdir)/$(RUNNABLE)
 
@@ -97,10 +97,8 @@ START_LINKER = echo ',batch' && echo ',bench on'
 # Targets:
 
 IMAGE = scsh.image
-INITIAL = build/initial.image
-#JMG: renamed the vm
-#JMG: we need cig at the moment
-VM = scsh06vm
+INITIAL = $(srcdir)/build/initial.image
+VM = scshvm
 LIBCIG = cig/lib$(VM).a
 CIG = cig/cig
 CIGOBJS = cig/libcig.o cig/libcig1.o
@@ -205,7 +203,6 @@ JMG: scsh stuff
 # This says how to process .scm files with cig to make .c stubs.
 .SUFFIXES: .scm
 .scm.c:
-#	$(srcdir)/cig/cigscript $* 
 	$(srcdir)/$(VM) -o $(srcdir)/$(VM) -i $(CIG) < $< > $*.c
 
 # These .h files mediate between the code exported from foo1.c
@@ -218,7 +215,6 @@ scsh/userinfo1.o: scsh/userinfo1.h
 scsh/fdports1.o	  scsh/fdports.o:  scsh/fdports1.h
 scsh/flock1.o	  scsh/flock.o:	   scsh/flock1.h
 scsh/network1.o	  scsh/network.o:  scsh/network1.h
-#JMG exists no longer in 0.5.2scsh/re1.o	  scsh/re.o:	   scsh/re1.h
 scsh/select1.o	  scsh/select.o:   scsh/select1.h
 scsh/syscalls1.o  scsh/syscalls.o: scsh/syscalls1.h
 scsh/time1.o	  scsh/time.o:	   scsh/time1.h
@@ -300,21 +296,18 @@ $(IMAGE): $(VM) scheme/env/init-defpackage.scm scheme/more-interfaces.scm \
 		'$(INITIAL)'
 
 ### Fake targets:  all clean install man dist
+#inst-man 
+install: dirs inst-script inst-vm inst-misc inst-inc install-cig \
+	install-scsh
 
-install: enough dirs inst-script inst-vm inst-misc inst-man inst-inc install-cig \
-	inst-image
-
-inst-vm:
+inst-vm: $(VM)
 	$(INSTALL_PROGRAM) $(VM) $(LIB)
 
-inst-image:
-	rm -f '/tmp/$(IMAGE)' &&					\
-	build/build-usual-image . '$(LIB)' '/tmp/$(IMAGE)' './$(VM)'	\
-		'$(INITIAL)' &&						\
-	$(INSTALL_DATA) /tmp/$(IMAGE) $(LIB) &&				\
-	rm /tmp/$(IMAGE)
+inst-image: $(IMAGE)
+	$(INSTALL_DATA) $(IMAGE) $(LIB) 				
 
-inst-man:
+
+inst-man: $(MANPAGE)
 	if [ -d $(mandir) -a -w $(mandir) ]; then			   \
 		sed 's=LBIN=$(bindir)=g' doc/scheme48.man |		   \
 			sed 's=LLIB=$(LIB)=g' |				   \
@@ -327,7 +320,7 @@ inst-man:
 	fi
 
 inst-inc:
-	$(INSTALL_DATA) c/scheme48.h $(incdir)
+	$(INSTALL_DATA) $(srcdir)/c/scheme48.h $(incdir)
 
 install-cig: cig
 	$(INSTALL_PROGRAM) $(srcdir)/$(CIG) $(LIB)/cig
@@ -374,7 +367,7 @@ dirs:
 		echo "$(LIB) not a writable directory" >&2;		 \
 		exit 1;							 \
 	}
-	for dir in rts env big opt misc link; do			  \
+	for dir in rts env big opt misc link scsh; do			  \
 		{ mkdir -p $(LIB)/$$dir && [ -w $(LIB)/$$dir ]; } || {	  \
 			echo "$(LIB)/$$dir not a writable directory" >&2; \
 			exit 1;						  \
@@ -383,7 +376,7 @@ dirs:
 
 configure: configure.in
 	autoheader && autoconf
-#JMG: clean cig and the scsh too
+
 clean: clean-cig clean-scsh
 	-rm -f $(VM) *.o c/unix/*.o c/*.o c/fake/*.o			\
 		TAGS $(IMAGE)						\
@@ -391,6 +384,7 @@ clean: clean-cig clean-scsh
 		scheme/debug/*.image scheme/debug/*.debug	\
 		scheme/vm/scheme48vm.c scheme/vm/scheme48heap.c		\
 		go $(distname)
+
 clean-cig:
 	-rm -f cig/*.o $(CIG) $(CIG).image $(LIBCIG)
 
@@ -400,7 +394,7 @@ clean-scm2c:
 	scsh/sighandlers.c scsh/rx/re-low.c
 
 
-#JMG: moved config.cache to distclean
+#JMG: moved config.cache to distclean for easier debugging
 distclean: clean
 	rm -f Makefile config.log config.status c/sysdep.h config.cache
 
@@ -654,7 +648,6 @@ c/old-scheme48.h: scheme/vm/arch.scm scheme/vm/data.scm \
 # Never called automatically.  Do not use unless you are sure you
 # know what you are doing.
 # Afterwards, you should probably make c/scheme48.h.
-i-know: i-know-what-i-am-doing
 i-know-what-i-am-doing:
 	cd ps-compiler &&						     \
 	(echo ',batch';							     \
@@ -666,6 +659,7 @@ i-know-what-i-am-doing:
 		echo ',exit'						     \
 	) | $(RUNNABLE) -h 5000000 &&					     \
 		mv ../scheme/vm/scheme48vm.c ../scheme/vm/scheme48heap.c ../c
+
 cig: $(CIG) $(CIG).image $(LIBCIG)
 
 
@@ -800,9 +794,6 @@ loads = $(srcdir)/scsh/let-opt.scm $(srcdir)/scsh/scsh-interfaces.scm \
 	 $(srcdir)/scsh/lib/list-pack.scm \
 	 $(srcdir)/scsh/lib/ccp-pack.scm
 
-#JMG : not anymore appropriate 
-#echo ",open external-calls"; \
-#	 echo "(lookup-all-externals)"; \
 
 bs:	 build/build-scsh-image
 	sh $(srcdir)/build/build-scsh-image "$(srcdir)" "$(LIB)" "$(IMAGE)" \
@@ -838,8 +829,6 @@ scsh/scsh.image: $(VM) $(SCHEME) $(CIG).image
 	 echo ",batch off"; \
 	 echo ",open scsh-top-package"; \
 	 echo ",keep names maps files source tabulate"; \
-	 echo ",dump scsh06.image"; \
-	 echo ",keep names maps files source tabulate"; \
 	 echo "(dump-scsh \"scsh/scsh.image\")"; \
 	 echo ",batch on") \
 	| ./$(VM) -o ./$(VM) -i $(CIG).image -h 10000000