# HG changeset patch # User jwe # Date 782090254 0 # Node ID 1844c17634f957b4a7786d80a957dfc9fe3534f0 # Parent b7d68dfee8d817f8e123efbb31748da759486bd8 [project @ 1994-10-13 23:17:34 by jwe] diff -r b7d68dfee8d8 -r 1844c17634f9 doc/interpreter/Makefile.in --- a/doc/interpreter/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/doc/interpreter/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -126,8 +126,7 @@ .PHONY: check install: all - if test -d $(infodir) ; then true ; \ - else $(TOPDIR)/mkpath $(infodir) ; fi + $(srcdir)/mkinstalldirs $(infodir) $(mandir) if test -d $(infodir) ; then \ rm -f $(infodir)/octave.info* ; \ if test -f octave.info ; then \ @@ -140,8 +139,6 @@ done ; \ fi ; \ fi - if test -d $(mandir) ; then true ; \ - else $(TOPDIR)/mkpath $(mandir) ; fi if test -d $(mandir) ; then \ rm -f $(mandir)/octave.$(manext) ; \ $(INSTALL_DATA) $(srcdir)/octave.1 $(mandir)/octave.$(manext) ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 libcruft/Makefile.in --- a/libcruft/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/libcruft/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -55,7 +55,7 @@ install: for dir in $(SUBDIRS); do echo making $@ in $$dir; cd $$dir; $(MAKE) $(MDEFINES) $@; cd ..; done - if test -d $(libdir) ; then true ; else $(TOPDIR)/mkpath $(libdir) ; fi + $(srcdir)/mkinstalldirs $(libdir) rm -f $(libdir)/libcruft.a $(INSTALL_DATA) libcruft.a $(libdir)/libcruft.a $(RANLIB) $(libdir)/libcruft.a diff -r b7d68dfee8d8 -r 1844c17634f9 liboctave/Makefile.in --- a/liboctave/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/liboctave/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -70,12 +70,10 @@ .PHONY: check install: all - if test -d $(libdir) ; then true ; else $(TOPDIR)/mkpath $(libdir) ; fi + $(srcdir)/mkinstalldirs $(libdir) $(includedir) rm -f $(libdir)/liboctave.a $(INSTALL_DATA) liboctave.a $(libdir)/liboctave.a $(RANLIB) $(libdir)/liboctave.a - if test -d $(includedir) ; then true ; \ - else $(TOPDIR)/mkpath $(includedir) ; fi for f in $(INCLUDES) $(TEMPLATE_SRC) ; do \ rm -f $(includedir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(includedir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 octMakefile.in --- a/octMakefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/octMakefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -16,10 +16,11 @@ DISTFILES = BUGS COPYING INSTALL INSTALL.OCTAVE Makefile.in \ Makeconf.in NEWS PROJECTS README README.NLP SENDING-PATCHES \ - THANKS f2c-compat.sh flibs.sh cxxlibs.sh configure configure.in \ - config.guess config.sub float-type.c move-if-change octave.sh \ - octave-bug.in octave-mode.el install.sh doinstall.sh mkpath.c \ - config.h.in acconfig.h MAKEINFO.PATCH ChangeLog ChangeLog.[0-9] + THANKS f2c-compat.sh flibs.sh cxxlibs.sh configure \ + configure.in config.guess config.sub float-type.c \ + move-if-change octave.sh octave-bug.in octave-mode.el \ + install.sh doinstall.sh mkinstalldirs config.h.in acconfig.h \ + MAKEINFO.PATCH ChangeLog ChangeLog.[0-9] # Complete directory trees to distribute. DISTDIRS = bsd-math kpathsea @@ -32,7 +33,7 @@ BINDISTFILES = COPYING ChangeLog NEWS README THANKS INSTALL.OCTAVE \ BUGS PROJECTS octave.sh octave-mode.el doinstall.sh \ - mkpath + mkinstalldirs # Subdirectories to run `make dist' in BINDISTSUBDIRS = doc scripts @@ -41,13 +42,10 @@ `echo $(localfcnfilepath) | awk -F: '{for (i=1; i<=NF; i++) print $i}'` \ `echo $(localoctfilepath) | awk -F: '{for (i=1; i<=NF; i++) print $i}'` -all: mkpath octave-bug +all: octave-bug for dir in $(SUBDIRS); do echo making $@ in $$dir; cd $$dir; $(MAKE) $@; cd ..; done .PHONY: all -mkpath: - $(CC) $(ALL_CFLAGS) $(srcdir)/mkpath.c -o mkpath - octave-bug: octave-bug.in @(sed < $< > $@.tmp \ -e "s;%VERSION%;${version};" \ @@ -114,9 +112,7 @@ .PHONY: BUGS.info install: - for dir in $(DIRS_TO_MAKE) ; do \ - if test -d $$dir ; then true ; else ./mkpath $$dir ; fi ; \ - done + $(srcdir)/mkinstalldirs $(DIRS_TO_MAKE) install -m 755 octave-bug $(bindir)/octave-bug for dir in $(SUBDIRS); do echo making $@ in $$dir; cd $$dir; $(MAKE) $@; cd ..; done .PHONY: install diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/control/Makefile.in --- a/scripts/control/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/control/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/elfun/Makefile.in --- a/scripts/elfun/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/elfun/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/general/Makefile.in --- a/scripts/general/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/general/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/image/Makefile.in --- a/scripts/image/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/image/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -37,20 +37,17 @@ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) octtopnm.o -o octtopnm install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ done - if test -d $(fcnfiledir)/imagelib ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/imagelib ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/imagelib for f in $(IMAGE_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/imagelib/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/imagelib/$$f ; \ done - if test -d $(archlibdir) ; then true ; \ - else $(TOPDIR)/mkpath $(archlibdir) ; fi + $(srcdir)/mkinstalldirs $(archlibdir) $(INSTALL_PROGRAM) octtopnm $(archlibdir)/octtopnm .PHONY: install diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/linear-algebra/Makefile.in --- a/scripts/linear-algebra/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/linear-algebra/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/miscellaneous/Makefile.in --- a/scripts/miscellaneous/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/miscellaneous/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/plot/Makefile.in --- a/scripts/plot/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/plot/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/polynomial/Makefile.in --- a/scripts/polynomial/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/polynomial/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/set/Makefile.in --- a/scripts/set/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/set/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/signal/Makefile.in --- a/scripts/signal/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/signal/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/specfun/Makefile.in --- a/scripts/specfun/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/specfun/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/special-matrix/Makefile.in --- a/scripts/special-matrix/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/special-matrix/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/startup/Makefile.in --- a/scripts/startup/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/startup/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) if test -f $(fcnfiledir)/$(script_sub_dir)/octaverc ; then true ; \ else \ $(INSTALL_DATA) $(srcdir)/octaverc \ diff -r b7d68dfee8d8 -r 1844c17634f9 scripts/statistics/Makefile.in --- a/scripts/statistics/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/scripts/statistics/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -31,8 +31,7 @@ .PHONY: all install: all - if test -d $(fcnfiledir)/$(script_sub_dir) ; then true ; \ - else $(TOPDIR)/mkpath $(fcnfiledir)/$(script_sub_dir) ; fi + $(srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) for f in $(FCN_FILES_NO_DIR) ; do \ rm -f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f ; \ diff -r b7d68dfee8d8 -r 1844c17634f9 src/Makefile.in --- a/src/Makefile.in Thu Oct 13 17:13:55 1994 +0000 +++ b/src/Makefile.in Thu Oct 13 23:17:34 1994 +0000 @@ -150,11 +150,10 @@ .PHONY: check install: all - if test -d $(bindir) ; then true ; else $(TOPDIR)/mkpath $(bindir) ; fi + $(srcdir)/mkinstalldirs $(bindir) $(libdir) rm -f $(bindir)/octave $(INSTALL) octave $(bindir)/octave-$(version) ln $(bindir)/octave-$(version) $(bindir)/octave - if test -d $(libdir) ; then true ; else $(TOPDIR)/mkpath $(libdir) ; fi if $(OCTAVE_LITE) && $(WITH_DLD) ; then \ $(INSTALL_DATA) liboctdld.a $(libdir)/liboctdld.a ; \ fi