Mercurial > octave-nkf
changeset 20368:23172e987766
Fix 'make install' errors for non-recursive build
* etc/module.mk (all-local, install-data-local, uninstall-local): New targets.
(etc/icons/octave.appdata.xml): Fix typo. (install-icons): Update file path.
* libinterp/module.mk (install-built-in-docstrings): Update file path.
* scripts/module.mk (install-startup-files): Update file paths.
* src/module.mk (make-version-links, remove-version-links): Use $(notdir) to
operate on executable file name.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Sat, 11 Jul 2015 23:59:01 -0400 |
| parents | a6080f6152b7 |
| children | 07dd8e602f4e |
| files | etc/module.mk libinterp/module.mk scripts/module.mk src/module.mk |
| diffstat | 4 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/module.mk Sat Jul 11 23:33:51 2015 -0400 +++ b/etc/module.mk Sat Jul 11 23:59:01 2015 -0400 @@ -60,9 +60,11 @@ DIRSTAMP_FILES += \ etc/icons/$(octave_dirstamp) +all-local: all-icons + all-icons: etc/icons/octave.appdata.xml etc/icons/octave.desktop $(BUILT_ICONS) -etc/icons/octave.appdata.xml: etc/iconst/octave.appdata.xml.in Makefile etc/icons/$(octave_dirstamp) +etc/icons/octave.appdata.xml: etc/icons/octave.appdata.xml.in Makefile etc/icons/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t $@ && \ $(SED) < $< > $@-t \ -e "s|%OCTAVE_DESKTOP_FILE%|${VENDOR}-octave.desktop|" && \ @@ -85,10 +87,14 @@ $(ICOTOOL) --create --raw $(WINDOWS_PNG_ICONS) > $@-t && \ mv $@-t $@ +install-data-local: install-icons + +uninstall-local: uninstall-icons + install-icons: -if test -n "$(DESKTOP_FILE_INSTALL)"; then \ $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \ - --vendor $(VENDOR) octave.desktop; \ + --vendor $(VENDOR) etc/icons/octave.desktop; \ fi for f in $(BUILT_PNG_ICONS); do \ size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \
--- a/libinterp/module.mk Sat Jul 11 23:33:51 2015 -0400 +++ b/libinterp/module.mk Sat Jul 11 23:59:01 2015 -0400 @@ -351,7 +351,7 @@ if AMCOND_BUILD_DOCS install-built-in-docstrings: $(MKDIR_P) $(DESTDIR)$(octetcdir) - $(INSTALL_DATA) DOCSTRINGS $(DESTDIR)$(octetcdir)/built-in-docstrings + $(INSTALL_DATA) libinterp/DOCSTRINGS $(DESTDIR)$(octetcdir)/built-in-docstrings uninstall-built-in-docstrings: rm -f $(DESTDIR)$(octetcdir)/built-in-docstrings
--- a/scripts/module.mk Sat Jul 11 23:33:51 2015 -0400 +++ b/scripts/module.mk Sat Jul 11 23:59:01 2015 -0400 @@ -152,19 +152,19 @@ $(MKDIR_P) $(DESTDIR)$(fcnfiledir)/startup if test -f $(DESTDIR)$(fcnfiledir)/startup/octaverc; then true; \ else \ - $(INSTALL_DATA) $(srcdir)/scripts/$(SYSTEM_STARTUP_FILE_SRC) \ + $(INSTALL_DATA) $(srcdir)/$(SYSTEM_STARTUP_FILE_SRC) \ $(DESTDIR)$(fcnfiledir)/startup/octaverc; \ fi if test -f $(DESTDIR)$(fcnfiledir)/startup/inputrc; then true; \ else \ - $(INSTALL_DATA) $(srcdir)/scripts/$(SYSTEM_INPUTRC_FILE_SRC) \ + $(INSTALL_DATA) $(srcdir)/$(SYSTEM_INPUTRC_FILE_SRC) \ $(DESTDIR)$(fcnfiledir)/startup/inputrc; \ fi $(MKDIR_P) $(DESTDIR)$(localfcnfiledir)/startup if test -f $(DESTDIR)$(localfcnfiledir)/startup/octaverc; \ then true; \ else \ - $(INSTALL_DATA) $(srcdir)/scripts/$(LOCAL_STARTUP_FILE_SRC) \ + $(INSTALL_DATA) $(srcdir)/$(LOCAL_STARTUP_FILE_SRC) \ $(DESTDIR)$(localfcnfiledir)/startup/octaverc; \ fi .PHONY: install-startup-files
--- a/src/module.mk Sat Jul 11 23:33:51 2015 -0400 +++ b/src/module.mk Sat Jul 11 23:59:01 2015 -0400 @@ -195,13 +195,13 @@ make-version-links: cd $(DESTDIR)$(bindir) && \ - for f in $(basename $(bin_PROGRAMS)); do \ + for f in $(notdir $(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 \ + for f in $(notdir $(basename $(bin_PROGRAMS))); do \ rm -f $(DESTDIR)$(bindir)/$$f-$(version)$(EXEEXT); \ done