changeset 979:0f3e32a0c440

[project @ 1994-12-13 04:36:10 by jwe]
author jwe
date Tue, 13 Dec 1994 04:40:28 +0000
parents 70d636c77e96
children 4793e60ad17c
files doc/interpreter/Makefile.in octMakefile.in scripts/Makefile.in scripts/control/Makefile.in scripts/elfun/Makefile.in scripts/general/Makefile.in scripts/image/Makefile.in scripts/linear-algebra/Makefile.in scripts/miscellaneous/Makefile.in scripts/plot/Makefile.in scripts/polynomial/Makefile.in scripts/set/Makefile.in scripts/signal/Makefile.in scripts/specfun/Makefile.in scripts/special-matrix/Makefile.in scripts/startup/Makefile.in scripts/statistics/Makefile.in scripts/strings/Makefile.in
diffstat 18 files changed, 27 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -138,17 +138,21 @@
 .PHONY: check
 
 install: all
-	$(top_srcdir)/mkinstalldirs $(infodir) $(mandir)
+	$(top_srcdir)/mkinstalldirs $(mandir) $(infodir)
+	@if test -d $(mandir) ; then \
+	  rm -f $(mandir)/octave.$(manext) ; \
+	  echo "installing $(srcdir)/octave.1 in $(mandir)" ; \
+	  $(INSTALL_DATA) $(srcdir)/octave.1 $(mandir)/octave.$(manext) ; \
+	fi
 	@if test -d $(infodir) ; then \
 	  rm -f $(infodir)/octave.info* ; \
+	  echo "installing info files in $(infodir)" ; \
 	  if test -f octave.info ; then \
 	    for f in octave.info* ; do \
-	      echo "installing $$f in $(infodir)" ; \
 	      $(INSTALL_DATA) $$f $(infodir)/$$f ; \
 	    done ; \
 	  else \
 	    for f in $(srcdir)/octave.info* ; do \
-	      echo "installing $$f in $(infodir)" ; \
 	      $(INSTALL_DATA) $$f $(infodir)/`basename $$f` ; \
 	    done ; \
 	  fi ; \
@@ -166,11 +170,6 @@
 	    $(INSTALL_DATA) $(srcdir)/dir $(infodir)/dir ; \
 	  fi ; \
 	fi
-	@if test -d $(mandir) ; then \
-	  rm -f $(mandir)/octave.$(manext) ; \
-	  echo "installing $(srcdir)/octave.1 in $(mandir)" ; \
-	  $(INSTALL_DATA) $(srcdir)/octave.1 $(mandir)/octave.$(manext) ; \
-	fi
 .PHONY: install
 
 uninstall:
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -26,17 +26,18 @@
 DISTDIRS = bsd-math kpathsea
 
 # Subdirectories to run make in for the primary targets.
-SUBDIRS = libcruft liboctave @DLD_DIR@ info readline kpathsea src doc scripts 
+SUBDIRS = libcruft liboctave @DLD_DIR@ info readline kpathsea src \
+	scripts doc 
 
 # Subdirectories to run `make dist' in
-DISTSUBDIRS = libcruft liboctave info readline src doc scripts dld test
+DISTSUBDIRS = libcruft liboctave info readline src scripts dld test doc 
 
 BINDISTFILES = COPYING ChangeLog NEWS README THANKS INSTALL.OCTAVE \
 	BUGS PROJECTS octave-bug octave.sh octave-mode.el doinstall.sh \
 	mkinstalldirs
 
 # Subdirectories to run `make dist' in
-BINDISTSUBDIRS = doc scripts
+BINDISTSUBDIRS = scripts doc
 
 DIRS_TO_MAKE = $(bindir) $(fcnfiledir) $(octfiledir) $(archlibdir) \
   `echo $(localfcnfilepath) | awk -F: '{for (i=1; i<=NF; i++) print $i}'` \
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -37,7 +37,7 @@
 	for dir in $(SUBDIRS); do echo making $@ in $$dir; cd $$dir; $(MAKE) $@; cd ..; done
 .PHONY: all
 
-install: all
+install:
 	for dir in $(SUBDIRS); do echo making $@ in $$dir; cd $$dir; $(MAKE) $@; cd ..; done
 .PHONY: install
 
--- a/scripts/control/Makefile.in
+++ b/scripts/control/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/elfun/Makefile.in
+++ b/scripts/elfun/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/general/Makefile.in
+++ b/scripts/general/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/image/Makefile.in
+++ b/scripts/image/Makefile.in
@@ -37,7 +37,7 @@
 octtopnm: octtopnm.o
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) octtopnm.o -o octtopnm
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/linear-algebra/Makefile.in
+++ b/scripts/linear-algebra/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/miscellaneous/Makefile.in
+++ b/scripts/miscellaneous/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/plot/Makefile.in
+++ b/scripts/plot/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/polynomial/Makefile.in
+++ b/scripts/polynomial/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/set/Makefile.in
+++ b/scripts/set/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/signal/Makefile.in
+++ b/scripts/signal/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/specfun/Makefile.in
+++ b/scripts/specfun/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/special-matrix/Makefile.in
+++ b/scripts/special-matrix/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/startup/Makefile.in
+++ b/scripts/startup/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	if test -f $(fcnfiledir)/$(script_sub_dir)/octaverc ; then true ; \
 	else \
--- a/scripts/statistics/Makefile.in
+++ b/scripts/statistics/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \
--- a/scripts/strings/Makefile.in
+++ b/scripts/strings/Makefile.in
@@ -30,7 +30,7 @@
 all:
 .PHONY: all
 
-install: all
+install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
 	  rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \