Mercurial > hg > octave-nkf

comparison etc/module.mk @ 20543:23172e987766

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fa9fa6ab76f0
children 9b44691a3520
comparison
equal deleted inserted replaced
20542:a6080f6152b7 20543:23172e987766
58 VENDOR = www.octave.org 58 VENDOR = www.octave.org
59 59
60 DIRSTAMP_FILES += \ 60 DIRSTAMP_FILES += \
61 etc/icons/$(octave_dirstamp) 61 etc/icons/$(octave_dirstamp)
62 62
63 all-local: all-icons
64
63 all-icons: etc/icons/octave.appdata.xml etc/icons/octave.desktop $(BUILT_ICONS) 65 all-icons: etc/icons/octave.appdata.xml etc/icons/octave.desktop $(BUILT_ICONS)
64 66
65 etc/icons/octave.appdata.xml: etc/iconst/octave.appdata.xml.in Makefile etc/icons/$(octave_dirstamp) 67 etc/icons/octave.appdata.xml: etc/icons/octave.appdata.xml.in Makefile etc/icons/$(octave_dirstamp)
66 $(AM_V_GEN)rm -f $@-t $@ && \ 68 $(AM_V_GEN)rm -f $@-t $@ && \
67 $(SED) < $< > $@-t \ 69 $(SED) < $< > $@-t \
68 -e "s|%OCTAVE_DESKTOP_FILE%|${VENDOR}-octave.desktop|" && \ 70 -e "s|%OCTAVE_DESKTOP_FILE%|${VENDOR}-octave.desktop|" && \
69 mv $@-t $@ 71 mv $@-t $@
70 72
83 etc/icons/octave-logo.ico: $(WINDOWS_PNG_ICONS) etc/icons/$(octave_dirstamp) 85 etc/icons/octave-logo.ico: $(WINDOWS_PNG_ICONS) etc/icons/$(octave_dirstamp)
84 $(AM_V_GEN)rm -f $@-t $@ && \ 86 $(AM_V_GEN)rm -f $@-t $@ && \
85 $(ICOTOOL) --create --raw $(WINDOWS_PNG_ICONS) > $@-t && \ 87 $(ICOTOOL) --create --raw $(WINDOWS_PNG_ICONS) > $@-t && \
86 mv $@-t $@ 88 mv $@-t $@
87 89
90 install-data-local: install-icons
91
92 uninstall-local: uninstall-icons
93
88 install-icons: 94 install-icons:
89 -if test -n "$(DESKTOP_FILE_INSTALL)"; then \ 95 -if test -n "$(DESKTOP_FILE_INSTALL)"; then \
90 $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \ 96 $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \
91 --vendor $(VENDOR) octave.desktop; \ 97 --vendor $(VENDOR) etc/icons/octave.desktop; \
92 fi 98 fi
93 for f in $(BUILT_PNG_ICONS); do \ 99 for f in $(BUILT_PNG_ICONS); do \
94 size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \ 100 size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \
95 if test -f $$f; then d=; else d="$(srcdir)/etc/icons/"; fi; \ 101 if test -f $$f; then d=; else d="$(srcdir)/etc/icons/"; fi; \
96 $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \ 102 $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \