Mercurial > hg > octave-terminal
changeset 12754:5ee4fc58585f stable
* Makefile.am (CLEANFILES): Remove $(bin_PROGRAMS)
and $(bin_SCRIPTS) from the list.
(all-local): Don't depend on $(bin_PROGRAMS) and $(bin_SCRIPTS).
(install-exec-hook, uninstall-local): Delete targets.
* src/Makefile.am (CLEANFILES): Include $(bin_PROGRAMS)
and $(bin_SCRIPTS) in the list.
(all-local): Depend on $(bin_PROGRAMS) and $(bin_SCRIPTS).
(make-version-links, remove-version-links): Handle $(bin_SCRIPTS).
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 19 Jun 2011 12:51:36 -0400 |
parents | 00fbb05f099c |
children | 59f5c239b9cf |
files | Makefile.am src/Makefile.am |
diffstat | 2 files changed, 26 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am +++ b/Makefile.am @@ -85,7 +85,7 @@ BUGS \ INSTALL.OCTAVE -CLEANFILES = $(bin_PROGRAMS) $(bin_SCRIPTS) $(BUILT_SOURCES) +CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = .gdbinit @@ -95,7 +95,7 @@ nodist_octinclude_HEADERS = config.h -all-local: $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_SCRIPTS) $(INFO_FILES) .gdbinit +all-local: $(noinst_SCRIPTS) $(INFO_FILES) .gdbinit @echo "" @echo "Octave successfully built. Now choose from the following:" @echo "" @@ -145,36 +145,3 @@ $(MKDIR_P) $(addprefix $(DESTDIR), $(DIRS_TO_MAKE)) install-data-local: installdirs-local - -install-exec-hook: make-version-links - -uninstall-local: remove-version-links - -if AMCOND_BUILD_COMPILED_AUX_PROGRAMS -make-version-links: - cd $(DESTDIR)$(bindir) && \ - for f in $(basename $(bin_PROGRAMS)); do \ - mv $$f$(EXEEXT) $$f-$(version)$(EXEEXT) && \ - $(LN_S) $$f-$(version)$(EXEEXT) $$f$(EXEEXT); \ - done - -remove-version-links: - for f in $(basename $(bin_PROGRAMS)); do \ - rm -f $(DESTDIR)$(bindir)/$$f-$(version)$(EXEEXT); \ - done -else -make-version-links: - cd $(DESTDIR)$(bindir) && \ - for f in $(basename $(bin_SCRIPTS)); do \ - mv $$f $$f-$(version) && \ - $(LN_S) $$f-$(version) $$f; \ - done - -remove-version-links: - for f in $(basename $(bin_SCRIPTS)); do \ - rm -f $(DESTDIR)$(bindir)/$$f-$(version); \ - done -endif - -.PHONY: make-version-links remove-version-links -
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -818,7 +818,7 @@ $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS) -all-local: $(OCT_STAMP_FILES) DLD-FUNCTIONS/PKG_ADD .DOCSTRINGS +all-local: $(bin_PROGRAMS) $(bin_SCRIPTS) $(OCT_STAMP_FILES) DLD-FUNCTIONS/PKG_ADD .DOCSTRINGS if AMCOND_BUILD_COMPILED_AUX_PROGRAMS octave-config.cc: octave-config.cc.in Makefile @@ -844,13 +844,29 @@ make-version-links: cd $(DESTDIR)$(bindir) && \ - mv octave$(EXEEXT) octave-$(version)$(EXEEXT) && \ - $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT) -.PHONY: make-version-links + for f in $(basename $(bin_PROGRAMS)); do \ + mv $$f$(EXEEXT) $$f-$(version)$(EXEEXT) && \ + $(LN_S) $$f-$(version)$(EXEEXT) $$f$(EXEEXT); \ + done +if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS + cd $(DESTDIR)$(bindir) && \ + for f in $(basename $(bin_SCRIPTS)); do \ + mv $$f $$f-$(version) && \ + $(LN_S) $$f-$(version) $$f; \ + done +endif remove-version-links: - rm -f $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT) -.PHONY: remove-version-links + for f in $(basename $(bin_PROGRAMS)); do \ + rm -f $(DESTDIR)$(bindir)/$$f-$(version)$(EXEEXT); \ + done +if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS + for f in $(basename $(bin_SCRIPTS)); do \ + rm -f $(DESTDIR)$(bindir)/$$f-$(version); \ + done +endif + +.PHONY: make-version-links remove-version-links if AMCOND_ENABLE_DYNAMIC_LINKING install-oct: @@ -882,8 +898,9 @@ endif .PHONY: install-oct uninstall-oct - CLEANFILES = \ + $(bin_PROGRAMS) \ + $(bin_SCRIPTS) \ DLD-FUNCTIONS/PKG_ADD \ doc-files \ gendoc.cc \ @@ -900,4 +917,3 @@ MAINTAINERCLEANFILES = \ $(BUILT_DISTFILES) -