Mercurial > hg > octave-nkf
changeset 4413:2de7c7452a1e
[project @ 2003-05-14 22:27:43 by jwe]
author | jwe |
---|---|
date | Wed, 14 May 2003 22:28:18 +0000 |
parents | 34438519fac3 |
children | f071adceaa04 |
files | ChangeLog Makeconf.in doc/ChangeLog doc/interpreter/Makefile.in doc/liboctave/Makefile.in emacs/Makefile.in examples/Makefile.in libcruft/ChangeLog libcruft/Makefile.in libcruft/misc/Makefile.in liboctave/ChangeLog liboctave/Makefile.in octMakefile.in scripts/ChangeLog scripts/Makefile.in scripts/image/Makefile.in scripts/startup/Makefile.in src/ChangeLog src/Makefile.in |
diffstat | 19 files changed, 159 insertions(+), 125 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-05-14 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makeconf.in, octMakefile.in, emacs/Makefile.in, + examples/Makefile.in: Handle DESTDIR. + 2003-05-13 John W. Eaton <jwe@bevo.che.wisc.edu> * Makeconf.in (sbindir): New variable substitution.
--- a/Makeconf.in +++ b/Makeconf.in @@ -488,21 +488,22 @@ endef define do-script-install -$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) +$(top_srcdir)/mkinstalldirs \ + $(addprefix $(DESTDIR), $(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; \ + rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \ done -$(top_srcdir)/mkpkgadd $(fcnfiledir)/$(script_sub_dir) > $(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t -if [ -n "`cat $(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t`" ]; then \ - mv $(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t $(fcnfiledir)/$(script_sub_dir)/PKG_ADD ; \ +$(top_srcdir)/mkpkgadd $(DESTDIR)$(fcnfiledir)/$(script_sub_dir) > $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t +if [ -n "`cat $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t`" ]; then \ + mv $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD ; \ else \ - rm -f $(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t ; \ + rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t ; \ fi endef define do-script-uninstall for f in $(FCN_FILES_NO_DIR); \ - do rm -f $(fcnfiledir)/$(script_sub_dir)/$$f; \ + do rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \ done endef
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2003-05-14 John W. Eaton <jwe@bevo.che.wisc.edu> + + * interpreter/Makefile.in, doc/liboctave/Makefile.in: Handle DESTDIR. + 2003-02-19 John W. Eaton <jwe@bevo.che.wisc.edu> * interpreter/Makefile.in (MAN_BASE): Add octave-config.1 to the list.
--- a/doc/interpreter/Makefile.in +++ b/doc/interpreter/Makefile.in @@ -120,28 +120,28 @@ .PHONY: check install install-strip: all - $(top_srcdir)/mkinstalldirs $(man1dir) $(infodir) - @if test -d $(man1dir); then \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(infodir) + @if test -d $(DESTDIR)$(man1dir); then \ for f in $(MAN_BASE); do \ - rm -f $(man1dir)/$$f$(man1ext); \ - echo "installing $(srcdir)/$$f.1 in $(man1dir)"; \ - $(INSTALL_DATA) $(srcdir)/$$f.1 $(man1dir)/$$f$(man1ext); \ + rm -f $(DESTDIR)$(man1dir)/$$f$(man1ext); \ + echo "installing $(srcdir)/$$f.1 in $(DESTDIR)$(man1dir)"; \ + $(INSTALL_DATA) $(srcdir)/$$f.1 $(DESTDIR)$(man1dir)/$$f$(man1ext); \ done ; \ fi - @if test -d $(infodir); then \ - rm -f $(infodir)/octave.info*; \ - echo "installing info files in $(infodir)"; \ + @if test -d $(DESTDIR)$(infodir); then \ + rm -f $(DESTDIR)$(infodir)/octave.info*; \ + echo "installing info files in $(DESTDIR)$(infodir)"; \ if test -f octave.info; then \ for f in octave.info*; do \ - $(INSTALL_DATA) $$f $(infodir)/$$f; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$f; \ done; \ else \ for f in $(srcdir)/octave.info*; do \ - $(INSTALL_DATA) $$f $(infodir)/`basename $$f`; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/`basename $$f`; \ done; \ fi; \ - if test -f $(infodir)/dir; then \ - if grep "^\* Octave: (octave)." $(infodir)/dir > /dev/null; then \ + if test -f $(DESTDIR)$(infodir)/dir; then \ + if grep "^\* Octave: (octave)." $(DESTDIR)$(infodir)/dir > /dev/null; then \ true; \ else \ echo ""; \ @@ -150,19 +150,19 @@ echo "* Octave: (octave)."; \ echo " Interactive language for numerical computations."; \ echo ""; \ - echo "to $(infodir)/dir."; \ + echo "to $(DESTDIR)$(infodir)/dir."; \ echo ""; \ fi; \ else \ - echo "installing $(srcdir)/dir in $(infodir)"; \ - $(INSTALL_DATA) $(srcdir)/dir $(infodir)/dir; \ + echo "installing $(srcdir)/dir in $(DESTDIR)$(infodir)"; \ + $(INSTALL_DATA) $(srcdir)/dir $(DESTDIR)$(infodir)/dir; \ fi; \ fi .PHONY: install install-strip uninstall: rm -f $(infodir)/octave.info* - for f in $(MAN_BASE); do rm -f $(man1dir)/$$f$(man1ext); done + for f in $(MAN_BASE); do rm -f $(DESTDIR)$(man1dir)/$$f$(man1ext); done .PHONY: uninstall tags: $(SOURCES)
--- a/doc/liboctave/Makefile.in +++ b/doc/liboctave/Makefile.in @@ -66,7 +66,7 @@ .PHONY: install install-strip uninstall: - rm -f $(infodir)/liboctave.info* + rm -f $(DESTDIR)$(infodir)/liboctave.info* .PHONY: uninstall tags: $(SOURCES)
--- a/emacs/Makefile.in +++ b/emacs/Makefile.in @@ -31,11 +31,11 @@ .PHONY: all install install-strip: - $(INSTALL_SCRIPT) otags $(bindir)/otags + $(INSTALL_SCRIPT) otags $(DESTDIR)$(bindir)/otags .PHONY: install install-strip uninstall: - rm -f $(bindir)/otags + rm -f $(DESTDIR)$(bindir)/otags .PHONY: uninstall tags:
--- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -36,7 +36,7 @@ install install-strip: for f in $(SCRIPTS); do \ - $(INSTALL_SCRIPT) $(srcdir)/$$f $(archlibdir)/$$f; \ + $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(archlibdir)/$$f; \ done .PHONY: install install-strip
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,7 @@ +2003-05-14 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in, misc/Makefile.in: Handle DESTDIR. + 2003-02-20 John W. Eaton <jwe@bevo.che.wisc.edu> * blas/sgemm.f, blas/strsm.f, blas/ssyrk.f, blas/sscal.f,
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -118,23 +118,23 @@ @$(subdir-for-command) install:: - $(top_srcdir)/mkinstalldirs $(octlibdir) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) if $(STATIC_LIBS); then \ - rm -f $(octlibdir)/libcruft.$(LIBEXT) ; \ + rm -f $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \ $(INSTALL_DATA) libcruft.$(LIBEXT) \ - $(octlibdir)/libcruft.$(LIBEXT) ; \ - $(RANLIB) $(octlibdir)/libcruft.$(LIBEXT) ; \ + $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \ + $(RANLIB) $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \ fi if $(SHARED_LIBS); then \ - rm -f $(octlibdir)/libcruft.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \ $(INSTALL_PROGRAM) \ - libcruft.$(SHLLIB) $(octlibdir)/libcruft.$(SHLLIB_VER); \ - rm -f $(octlibdir)/libcruft.$(SHLLIB); \ - $(LN_S) libcruft.$(SHLLIB_VER) $(octlibdir)/libcruft.$(SHLLIB); \ + libcruft.$(SHLLIB) $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB); \ + $(LN_S) libcruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB); \ if test x$(SHLBIN) != x ; then \ - rm -f $(bindir)/libcruft.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/libcruft.$(SHLBIN); \ $(INSTALL_PROGRAM) \ - libcruft.$(SHLBIN) $(bindir)/libcruft.$(SHLBIN); \ + libcruft.$(SHLBIN) $(DESTDIR)$(bindir)/libcruft.$(SHLBIN); \ fi; \ fi @@ -142,12 +142,12 @@ $(MAKE) INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s" install uninstall:: - rm -f $(octlibdir)/libcruft.$(LIBEXT) - rm -f $(octlibdir)/libcruft.$(SHLLIB) - rm -f $(octlibdir)/libcruft.$(SHLLIB_VER) + rm -f $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) + rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB) + rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER) if test x$(SHLBIN) != x; then \ - rm -f $(bindir)/libcruft.$(SHLBIN); \ - rm -f $(bindir)/libcruft.$(SHLBIN_VER); \ + rm -f $(DESTDIR)$(bindir)/libcruft.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/libcruft.$(SHLBIN_VER); \ fi tags TAGS:: $(SOURCES)
--- a/libcruft/misc/Makefile.in +++ b/libcruft/misc/Makefile.in @@ -46,15 +46,15 @@ include ../Makerules install install-strip:: - $(top_srcdir)/mkinstalldirs $(octincludedir)/octave + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octincludedir)/octave for f in $(INCLUDES); do \ - rm -f $(octincludedir)/octave/$$f; \ - $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/octave/$$f; \ + rm -f $(DESTDIR)$(octincludedir)/octave/$$f; \ + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(octincludedir)/octave/$$f; \ done $(mk-includedir-link) uninstall:: - for f in $(INCLUDES); do rm -f $(octincludedir)/octave/$$f; done + for f in $(INCLUDES); do rm -f $(DESTDIR)$(octincludedir)/octave/$$f; done # Don't optimize.
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,5 +1,7 @@ 2003-05-14 John W. Eaton <jwe@bevo.che.wisc.edu> + * Makefile.in: Handle DESTDIR. + * kpse.cc (kpse_path_iterator::next): Skip consecutive colons here. (kpse_path_iterator::set_end): Don't miss last element when not followed by a colon.
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -238,48 +238,48 @@ .PHONY: install-strip install-lib: - $(top_srcdir)/mkinstalldirs $(octlibdir) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) if $(STATIC_LIBS); then \ - rm -f $(octlibdir)/liboctave.$(LIBEXT); \ + rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \ $(INSTALL_DATA) liboctave.$(LIBEXT) \ - $(octlibdir)/liboctave.$(LIBEXT); \ - $(RANLIB) $(octlibdir)/liboctave.$(LIBEXT); \ + $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \ + $(RANLIB) $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \ fi if $(SHARED_LIBS); then \ - rm -f $(octlibdir)/liboctave.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \ $(INSTALL_PROGRAM) \ - liboctave.$(SHLLIB) $(octlibdir)/liboctave.$(SHLLIB_VER); \ - rm -f $(octlibdir)/liboctave.$(SHLLIB); \ - $(LN_S) liboctave.$(SHLLIB_VER) $(octlibdir)/liboctave.$(SHLLIB); \ + liboctave.$(SHLLIB) $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB); \ + $(LN_S) liboctave.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB); \ if test x$(SHLBIN) != x ; then \ - rm -f $(bindir)/liboctave.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/liboctave.$(SHLBIN); \ $(INSTALL_PROGRAM) \ - liboctave.$(SHLBIN) $(bindir)/liboctave.$(SHLBIN); \ + liboctave.$(SHLBIN) $(DESTDIR)$(bindir)/liboctave.$(SHLBIN); \ fi; \ fi .PHONY: install-lib install-inc: - $(top_srcdir)/mkinstalldirs $(octincludedir)/octave + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octincludedir)/octave for f in $(INCLUDES_FOR_INSTALL); do \ - rm -f $(octincludedir)/octave/$$f; \ + rm -f $(DESTDIR)$(octincludedir)/octave/$$f; \ if [ -f $$f ]; then \ - $(INSTALL_DATA) $$f $(octincludedir)/octave/$$f; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(octincludedir)/octave/$$f; \ else \ - $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/octave/$$f; \ + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(octincludedir)/octave/$$f; \ fi ; \ done .PHONY: install-inc uninstall: - rm -f $(octlibdir)/liboctave.$(LIBEXT) - rm -f $(octlibdir)/liboctave.$(SHLLIB) - rm -f $(octlibdir)/liboctave.$(SHLLIB_VER) + rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT) + rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB) + rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER) if test x$(SHLBIN) != x; then \ - rm -f $(bindir)/liboctave.$(SHLBIN); \ - rm -f $(bindir)/liboctave.$(SHLBIN_VER); \ + rm -f $(DESTDIR)$(bindir)/liboctave.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/liboctave.$(SHLBIN_VER); \ fi - for f in $(INCLUDES); do rm -f $(octincludedir)/octave/$$f; done + for f in $(INCLUDES); do rm -f $(DESTDIR)$(octincludedir)/octave/$$f; done .PHONY: uninstall tags: $(SOURCES)
--- a/octMakefile.in +++ b/octMakefile.in @@ -105,17 +105,27 @@ .PHONY: BUGS INSTALL.OCTAVE install install-strip :: - $(top_srcdir)/mkinstalldirs $(DIRS_TO_MAKE) - rm -f $(bindir)/octave-bug - $(INSTALL_SCRIPT) octave-bug $(bindir)/octave-bug-$(version) - cd $(bindir); $(LN_S) octave-bug-$(version) octave-bug - rm -f $(bindir)/octave-config - $(INSTALL_SCRIPT) octave-config $(bindir)/octave-config-$(version) - cd $(bindir); $(LN_S) octave-config-$(version) octave-config - rm -f $(bindir)/mkoctfile - $(INSTALL_SCRIPT) mkoctfile $(bindir)/mkoctfile-$(version) - cd $(bindir); $(LN_S) mkoctfile-$(version) mkoctfile - $(INSTALL_DATA) config.h $(octincludedir)/octave/config.h + $(top_srcdir)/mkinstalldirs $(addprefix $(DESTDIR), $(DIRS_TO_MAKE)) + rm -f $(DESTDIR)$(bindir)/octave-bug + $(INSTALL_SCRIPT) octave-bug $(DESTDIR)$(bindir)/octave-bug-$(version) + $(LN_S) octave-bug-$(version) $(DESTDIR)$(bindir)/octave-bug + rm -f $(DESTDIR)$(bindir)/octave-config + $(INSTALL_SCRIPT) \ + octave-config $(DESTDIR)$(bindir)/octave-config-$(version) + $(LN_S) octave-config-$(version) $(DESTDIR)$(bindir)/octave-config + rm -f $(DESTDIR)$(bindir)/mkoctfile + $(INSTALL_SCRIPT) mkoctfile $(DESTDIR)$(bindir)/mkoctfile-$(version) + $(LN_S) mkoctfile-$(version) $(DESTDIR)$(bindir)/mkoctfile + $(INSTALL_DATA) config.h $(DESTDIR)$(octincludedir)/octave/config.h + +uninstall:: + rm -f $(DESTDIR)$(bindir)/octave-bug + rm -f $(DESTDIR)$(bindir)/octave-bug-$(version) + rm -f $(DESTDIR)$(bindir)/octave-config + rm -f $(DESTDIR)$(bindir)/octave-config-$(version) + rm -f $(DESTDIR)$(bindir)/mkoctfile + rm -f $(DESTDIR)$(bindir)/mkoctfile-$(version) + rm -f $(DESTDIR)$(octincludedir)/octave/config.h maintainer-clean:: @echo ""
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2003-05-14 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in, image/Makefile.in, startup/Makefile.in: Handle DESTDIR. + 2003-05-05 Andy Adler <adler@site.uottawa.ca> * plot/hist.m: Improve performance by using different algorithms
--- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -61,11 +61,11 @@ .PHONY: clean mostlyclean distclean maintainer-clean install install-strip:: - ls -LR $(datadir)/octave > $(datadir)/octave/ls-R - ls -LR $(libexecdir)/octave > $(libexecdir)/octave/ls-R + ls -LR $(DESTDIR)$(datadir)/octave > $(DESTDIR)$(datadir)/octave/ls-R + ls -LR $(DESTDIR)$(libexecdir)/octave > $(DESTDIR)$(libexecdir)/octave/ls-R uninstall:: - rm -f $(datadir)/octave/ls-R $(libexecdir)/octave/ls-R + rm -f $(DESTDIR)$(datadir)/octave/ls-R $(DESTDIR)$(libexecdir)/octave/ls-R tags TAGS:: $(SOURCES) $(SUBDIR_FOR_COMMAND)
--- a/scripts/image/Makefile.in +++ b/scripts/image/Makefile.in @@ -38,18 +38,18 @@ install install-strip: $(do-script-install) - $(top_srcdir)/mkinstalldirs $(imagedir) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(imagedir) for f in $(IMAGE_FILES_NO_DIR); do \ - rm -f $(imagedir)/$$f; \ - $(INSTALL_DATA) $(srcdir)/$$f $(imagedir)/$$f; \ + rm -f $(DESTDIR)$(imagedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(imagedir)/$$f; \ done - $(top_srcdir)/mkinstalldirs $(archlibdir) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(archlibdir) .PHONY: install install-strip uninstall: $(do-script-uninstall) for f in $(IMAGE_FILES_NO_DIR); \ - do rm -f $(imagedir)/$$f; \ + do rm -f $(DESTDIR)$(imagedir)/$$f; \ done .PHONY: uninstall
--- a/scripts/startup/Makefile.in +++ b/scripts/startup/Makefile.in @@ -33,28 +33,28 @@ .PHONY: all install install-strip: - $(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir) - if test -f $(fcnfiledir)/$(script_sub_dir)/octaverc; then true; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(fcnfiledir)/$(script_sub_dir) + if test -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/octaverc; then true; \ else \ $(INSTALL_DATA) $(srcdir)/octaverc \ - $(fcnfiledir)/$(script_sub_dir)/octaverc; \ + $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/octaverc; \ fi - $(top_srcdir)/mkinstalldirs $(localfcnfiledir)/$(script_sub_dir) - if test -f $(localfcnfiledir)/$(script_sub_dir)/octaverc; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localfcnfiledir)/$(script_sub_dir) + if test -f $(DESTDIR)$(localfcnfiledir)/$(script_sub_dir)/octaverc; \ then true; \ else \ $(INSTALL_DATA) $(srcdir)/octaverc \ - $(localfcnfiledir)/$(script_sub_dir)/octaverc; \ + $(DESTDIR)$(localfcnfiledir)/$(script_sub_dir)/octaverc; \ fi # for f in $(FCN_FILES_NO_DIR); do \ -# rm -f $(fcnfiledir)/$(script_sub_dir)/$$f; \ -# $(INSTALL_DATA) $(srcdir)/$$f $(fcnfiledir)/$(script_sub_dir)/$$f; \ +# rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \ +# $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \ # done .PHONY: install install-strip uninstall: # for f in $(FCN_FILES_NO_DIR); \ -# do rm -f $(fcnfiledir)/$(script_sub_dir)/$$f; \ +# do rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \ # done .PHONY: uninstall
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2003-05-14 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in: Handle DESTDIR. + 2003-05-13 John W. Eaton <jwe@bevo.che.wisc.edu> * lex.l: Use yyunput (X, yytext) instead of unput (X) for newer
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -339,72 +339,72 @@ .PHONY: install-strip install-bin: - $(top_srcdir)/mkinstalldirs $(bindir) - rm -f $(bindir)/octave$(EXEEXT) - $(INSTALL_PROGRAM) octave$(EXEEXT) $(bindir)/octave-$(version)$(EXEEXT) - cd $(bindir); $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) + rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT) + $(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT) + $(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT) .PHONY: install-bin install-oct: if [ -n "$(OCT_FILES)" ]; then \ - $(top_srcdir)/mkinstalldirs $(octfiledir); \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octfiledir); \ xfiles="$(OCT_FILES)"; \ for f in $$xfiles; do \ - $(INSTALL_PROGRAM) $$f $(octfiledir)/$$f; \ + $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \ done; \ - $(srcdir)/mk-oct-links $(octfiledir) $(DLD_DEF_FILES); \ + $(srcdir)/mk-oct-links $(DESTDIR)$(octfiledir) $(DLD_DEF_FILES); \ fi .PHONY: install-oct install-lib: - $(top_srcdir)/mkinstalldirs $(octlibdir) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) if $(STATIC_LIBS); then \ - rm -f $(octlibdir)/liboctinterp.$(LIBEXT); \ + rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \ $(INSTALL_DATA) liboctinterp.$(LIBEXT) \ - $(octlibdir)/liboctinterp.$(LIBEXT); \ - $(RANLIB) $(octlibdir)/liboctinterp.$(LIBEXT); \ + $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \ + $(RANLIB) $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \ fi if $(SHARED_LIBS); then \ - rm -f $(octlibdir)/liboctinterp.$(SHLEXT_VER); \ + rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \ $(INSTALL_PROGRAM) liboctinterp.$(SHLLIB) \ - $(octlibdir)/liboctinterp.$(SHLLIB_VER); \ - rm -f $(octlibdir)/liboctinterp.$(SHLLIB); \ - $(LN_S) liboctinterp.$(SHLLIB_VER) $(octlibdir)/liboctinterp.$(SHLLIB); \ + $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB); \ + $(LN_S) liboctinterp.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB); \ if test x$(SHLBIN) != x ; then \ - rm -f $(bindir)/liboctinterp.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/liboctinterp.$(SHLBIN); \ $(INSTALL_PROGRAM) \ - liboctinterp.$(SHLBIN) $(bindir)/liboctinterp.$(SHLBIN); \ + liboctinterp.$(SHLBIN) $(DESTDIR)$(bindir)/liboctinterp.$(SHLBIN); \ fi; \ fi .PHONY: install-lib install-inc: - $(top_srcdir)/mkinstalldirs $(octincludedir)/octave + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octincludedir)/octave for f in $(INCLUDES); do \ - rm -f $(octincludedir)/octave/$$f; \ - $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/octave/$$f; \ + rm -f $(DESTDIR)$(octincludedir)/octave/$$f; \ + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(octincludedir)/octave/$$f; \ done for f in defaults.h oct-conf.h oct-gperf.h; do \ - rm -f $(octincludedir)/octave/$$f; \ + rm -f $(DESTDIR)$(octincludedir)/octave/$$f; \ if [ -f $$f ]; then \ - $(INSTALL_DATA) $$f $(octincludedir)/octave/$$f ; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(octincludedir)/octave/$$f ; \ else \ - $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/octave/$$f ; \ + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(octincludedir)/octave/$$f ; \ fi ; \ done .PHONY: install-inc uninstall: - rm -f $(bindir)/octave$(EXEEXT) - rm -f $(octlibdir)/liboctinterp.$(LIBEXT) - rm -f $(octlibdir)/liboctinterp.$(SHLLIB) - rm -f $(octlibdir)/liboctinterp.$(SHLLIB_VER) + rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT) + rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT) + rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB) + rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB_VER) if test x$(SHLBIN) != x ; then \ - rm -f $(bindir)/liboctinterp.$(SHLBIN); \ - rm -f $(bindir)/liboctinterp.$(SHLBIN_VER); \ + rm -f $(DESTDIR)$(bindir)/liboctinterp.$(SHLBIN); \ + rm -f $(DESTDIR)$(bindir)/liboctinterp.$(SHLBIN_VER); \ fi for f in $(INCLUDES) defaults.h oct-conf.h; do \ - rm -f $(octincludedir)/octave/$$f; \ + rm -f $(DESTDIR)$(octincludedir)/octave/$$f; \ done .PHONY: uninstall