# HG changeset patch
# User jwe
# Date 854519403 0
# Node ID 042f5cbdb2a80ccb43ed453e32e7c790ab4051c2
# Parent  bba5bce877e0a78de75a8ce1abe73ad6e301b484
[project @ 1997-01-29 06:28:56 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
+Wed Jan 29 00:18:55 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in (INSTALL_SCRIPT): Substitute this in Makefiles.
+	* octMakefile.in (INSTALL_SCRIPT): New macro.
+	(install): Use it.
+	* Makefile.in (install-strip): New target.
+
 Tue Jan 28 09:48:32 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* aclocal.m4 (OCTAVE_FLIBS): Don't look for values-X*.o.  This is
+	apparently added automatically now by gcc.  Don't put space
+	between -L and directory name.
+
 	* Makefile.in (help): New target.
 	(header-msg): extract from all.
 	(all, help): Depend on header-msg.
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,6 +21,9 @@
 $(NO_DEP_TARGETS): FORCE
 	$(MAKE) -f octMakefile omit_deps=true $@
 
+install-strip:
+	$(MAKE) -f octMakefile INSTALL_PROGRAM='${INSTALL} -s' install
+
 binary-dist: FORCE
 	@echo "***"
 	@echo "*** you must specify either static or dynamic:"
@@ -76,6 +79,7 @@
 	@echo "  all                  build everything"
 	@echo "  check                run self tests"
 	@echo "  install              install files"
+	@echo "  install-strip        same as install but strip binaries"
 	@echo "  uninstall            delete installed files"
 	@echo ""
 	@echo "  dist                 create a source distribution"
@@ -104,5 +108,7 @@
 	@echo "  scripts              make all in subdirectory scripts"
 	@echo "  src                  make all in subdirectory src"
 	@echo ""
+	@echo "  help                 print this message"
+	@echo ""
 
 FORCE:
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.251 $)
+AC_REVISION($Revision: 1.252 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -1041,6 +1041,8 @@
 AC_SUBST(RUNTEST)
 
 AC_PROG_INSTALL
+INSTALL_SCRIPT='${INSTALL}'
+AC_SUBST(INSTALL_SCRIPT)
 
 EXE=
 case "$canonical_host_type" in
diff --git a/octMakefile.in b/octMakefile.in
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -16,6 +16,7 @@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 
 CONF_DISTFILES = Makefile.in octMakefile.in Makeconf.in configure \
@@ -101,8 +102,8 @@
 
 install::
 	$(top_srcdir)/mkinstalldirs $(DIRS_TO_MAKE)
-	$(INSTALL_PROGRAM) octave-bug $(bindir)/octave-bug
-	$(INSTALL_PROGRAM) mkoctfile $(bindir)/mkoctfile
+	$(INSTALL_SCRIPT) octave-bug $(bindir)/octave-bug
+	$(INSTALL_SCRIPT) mkoctfile $(bindir)/mkoctfile
 	$(INSTALL_DATA) config.h $(octincludedir)/config.h
 
 maintainer-clean::
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -70,7 +70,7 @@
 	rm -f tags TAGS Makefile config.log config.status
 
 dist:
-	$(LN_S) $(DISTFILES) ../`cat ../.fname`/scripts
+	ln $(DISTFILES) ../`cat ../.fname`/scripts
 	for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/scripts/$$dir; cd $$dir; $(MAKE) $@; cd ..; done
 .PHONY: dist