$NetBSD: patch-aa,v 1.4 2014/01/02 04:18:50 dholland Exp $

- Staged installation support.
- Remove wrong shell syntax (trailing &&).

--- Makefile.in.orig	1999-02-12 13:42:56.000000000 +0000
+++ Makefile.in
@@ -98,7 +98,7 @@ CONFIG_FILES = scheme/interfaces.scm sch
 
 # The following is the first rule and therefore the "make" command's
 # default target.
-enough: $(VM) $(IMAGE) go .notify
+enough: $(VM) $(IMAGE) go
 
 # The developers are curious to know.  Don't be concerned if this fails.
 .notify: build/minor-version-number
@@ -150,21 +150,21 @@ $(IMAGE): $(VM) scheme/env/init-defpacka
 install: enough dirs inst-script inst-vm inst-misc inst-man inst-inc inst-image
 
 inst-vm:
-	$(INSTALL_PROGRAM) $(VM) $(LIB)
+	$(INSTALL_PROGRAM) $(VM) $(DESTDIR)$(LIB)
 
 inst-image:
 	rm -f '/tmp/$(IMAGE)' &&					\
 	build/build-usual-image . '$(LIB)' '/tmp/$(IMAGE)' './$(VM)'	\
 		'$(INITIAL)' &&						\
-	$(INSTALL_DATA) /tmp/$(IMAGE) $(LIB) &&				\
+	$(INSTALL_DATA) /tmp/$(IMAGE) $(DESTDIR)$(LIB) &&		\
 	rm /tmp/$(IMAGE)
 
 inst-man:
-	if [ -d $(mandir) -a -w $(mandir) ]; then			   \
+	if [ -d $(DESTDIR)$(mandir) -a -w $(DESTDIR)$(mandir) ]; then	   \
 		sed 's=LBIN=$(bindir)=g' doc/scheme48.man |		   \
 			sed 's=LLIB=$(LIB)=g' |				   \
 			sed 's=LS48=$(RUNNABLE)=g' >$(MANPAGE) &&	   \
-		$(INSTALL_DATA) $(MANPAGE) $(mandir) &&			   \
+		$(INSTALL_DATA) $(MANPAGE) $(DESTDIR)$(mandir) &&	   \
 		rm $(MANPAGE);						   \
 	else								   \
 		echo "$(mandir) not writable dir, not installing man page" \
@@ -172,26 +172,26 @@ inst-man:
 	fi
 
 inst-inc:
-	$(INSTALL_DATA) c/kali.h $(incdir)
+	$(INSTALL_DATA) c/kali.h $(DESTDIR)$(incdir)
 
 inst-misc:
 	for stub in env big opt misc link; do				\
 		for f in scheme/$$stub/*.scm; do			\
-			$(INSTALL_DATA) $$f $(LIB)/$$stub || exit 1;	\
+			$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/$$stub || exit 1;	\
 		done;							\
 	done &&								\
 	for f in scheme/rts/*num.scm scheme/rts/jar-defrecord.scm; do	\
-		$(INSTALL_DATA) $$f $(LIB)/rts || exit 1;		\
-	done &&
+		$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/rts || exit 1;	\
+	done
 
 inst-script:
 	script=$(bindir)/$(RUNNABLE) &&					\
-	echo '#!/bin/sh'	>$$script &&				\
-	echo			>>$$script &&				\
-	echo 'lib=$(LIB)'	>>$$script &&				\
+	(echo '#!/bin/sh' &&						\
+	echo				 &&				\
+	echo 'lib=$(LIB)'		 &&				\
 	echo 'exec $$lib/$(VM) -o $$lib/$(VM) -i $$lib/$(IMAGE) "$$@"'	\
-				>>$$script &&				\
-	chmod +x $$script
+				)>>$(DESTDIR)$$script &&		\
+	chmod +x $(DESTDIR)$$script
 
 # Script to run kali in this directory.
 go:
@@ -204,17 +204,17 @@ go:
 
 dirs:
 	for dir in $(libdir) $(bindir) $(incdir); do			 \
-		[ -d $$dir -a -w $$dir ] || {				 \
+		[ -d $(DESTDIR)$$dir -a -w $(DESTDIR)$$dir ] || {	 \
 			echo "$$dir not a writable directory" >&2;	 \
 			exit 1;						 \
 		};							 \
 	done
-	{ mkdir -p $(LIB) && [ -w $(LIB) ]; } || {			 \
+	{ mkdir -p $(DESTDIR)$(LIB) && [ -w $(DESTDIR)$(LIB) ]; } || {	 \
 		echo "$(LIB) not a writable directory" >&2;		 \
 		exit 1;							 \
 	}
 	for dir in rts env big opt misc link; do			  \
-		{ mkdir -p $(LIB)/$$dir && [ -w $(LIB)/$$dir ]; } || {	  \
+		{ mkdir -p $(DESTDIR)$(LIB)/$$dir && [ -w $(DESTDIR)$(LIB)/$$dir ]; } || {	  \
 			echo "$(LIB)/$$dir not a writable directory" >&2; \
 			exit 1;						  \
 		};							  \