--- Makefile.in.orig	Tue Sep 12 23:32:08 2000
+++ Makefile.in	Tue Sep 12 23:36:20 2000
@@ -185,9 +185,9 @@
 # TARGETS: install & friends
 #####################################################################
 
-INSTALL         = install-sh -c
+INSTALL         = /usr/bin/install -c
 INSTALL_DATA    = ${INSTALL} -m 644
-INSTALL_PROGRAM = $(srcdir)/${INSTALL} -m 755
+INSTALL_PROGRAM = ${INSTALL} -m 755
 MKINSTDIRS      = $(srcdir)/mkinstalldirs
 
 install: install-main install-lib install-runtime
@@ -199,60 +199,60 @@
 	@if [ -f swig.exe ]; then					\
 		$(INSTALL_PROGRAM) swig.exe $(BIN_DIR)/swig.exe;	\
 	else								\
-		$(INSTALL_PROGRAM) swig $(BIN_DIR)/swig;		\
+		$(INSTALL_PROGRAM) swig $(DESTDIR)$(BIN_DIR)/swig;		\
 	fi
 
 install-lib:
 	@echo "Installing the SWIG library"
-	@$(MKINSTDIRS) $(SWIG_LIB)
+	@$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB)
 #	cd $(SWIG_LIB); rm -rf *
 #	The following line has `*.swg' removed -- add it back if needed.
 	@cd $(srcdir)/Lib; for i in *.i *.swg; \
 	    do \
 	    echo "Installing Lib/$$i"; \
-            ../$(INSTALL_DATA) $$i $(SWIG_LIB)/$$i; \
+            $(INSTALL_DATA) $$i $(DESTDIR)$(SWIG_LIB)/$$i; \
 	    done;
-	@$(MKINSTDIRS) $(SWIG_LIB)/tcl
+	@$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB)/tcl
 	@cd $(srcdir)/Lib/tcl; for i in *.i *.swg; \
 	    do \
 	    echo "Installing Lib/tcl/$$i"; \
-            ../../$(INSTALL_DATA) $$i $(SWIG_LIB)/tcl/$$i; \
+            $(INSTALL_DATA) $$i $(DESTDIR)$(SWIG_LIB)/tcl/$$i; \
 	    done;
-	@$(MKINSTDIRS) $(SWIG_LIB)/perl5
+	@$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB)/perl5
 	@cd $(srcdir)/Lib/perl5; for i in *.i *.swg Makefile.pl; \
 	    do \
 	    echo "Installing Lib/perl5/$$i"; \
-            ../../$(INSTALL_DATA) $$i $(SWIG_LIB)/perl5/$$i; \
+            $(INSTALL_DATA) $$i $(DESTDIR)$(SWIG_LIB)/perl5/$$i; \
 	    done;
-	@$(MKINSTDIRS) $(SWIG_LIB)/python
+	@$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB)/python
 	@cd $(srcdir)/Lib/python; for i in *.i *.swg; \
 	    do \
 	    echo "Installing Lib/python/$$i"; \
-            ../../$(INSTALL_DATA) $$i $(SWIG_LIB)/python/$$i; \
+            $(INSTALL_DATA) $$i $(DESTDIR)$(SWIG_LIB)/python/$$i; \
 	    done;
-	@$(MKINSTDIRS) $(SWIG_LIB)/guile
+	@$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB)/guile
 	@cd $(srcdir)/Lib/guile; for i in *.i *.swg; \
 	    do \
 	    echo "Installing Lib/guile/$$i"; \
-            ../../$(INSTALL_DATA) $$i $(SWIG_LIB)/guile/$$i; \
+            $(INSTALL_DATA) $$i $(DESTDIR)$(SWIG_LIB)/guile/$$i; \
 	    done;
-	@$(MKINSTDIRS) $(SWIG_LIB)/java
+	@$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB)/java
 	@cd $(srcdir)/Lib/java; for i in *.i *.swg; \
 	    do \
 	    echo "Installing Lib/java/$$i"; \
-            ../../$(INSTALL_DATA) $$i $(SWIG_LIB)/java/$$i; \
+            $(INSTALL_DATA) $$i $(DESTDIR)$(SWIG_LIB)/java/$$i; \
 	    done;
-	@$(MKINSTDIRS) $(SWIG_LIB)/mzscheme
+	@$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB)/mzscheme
 	@cd $(srcdir)/Lib/mzscheme; for i in *.i *.swg; \
 	    do \
 	    echo "Installing Lib/mzscheme/$$i"; \
-            ../../$(INSTALL_DATA) $$i $(SWIG_LIB)/mzscheme/$$i; \
+            $(INSTALL_DATA) $$i $(DESTDIR)$(SWIG_LIB)/mzscheme/$$i; \
 	    done;
-	@$(MKINSTDIRS) $(SWIG_LIB)/ruby
+	@$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB)/ruby
 	@cd $(srcdir)/Lib/ruby; for i in *.i *.swg Makefile.swig extconf.rb; \
 	    do \
 	    echo "Installing Lib/ruby/$$i"; \
-            ../../$(INSTALL_DATA) $$i $(SWIG_LIB)/ruby/$$i; \
+            $(INSTALL_DATA) $$i $(DESTDIR)$(SWIG_LIB)/ruby/$$i; \
 	    done;
 
 install-runtime:
