Mercurial > octave-nkf

annotate etc/module.mk @ 20368: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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
20341
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 EXTRA_DIST += \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 etc/NEWS.1 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 etc/NEWS.2 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 etc/NEWS.3 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 etc/PROJECTS \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 etc/README.Cygwin \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 etc/README.Linux \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 etc/README.MacOS \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 etc/README.MinGW \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 etc/README.Windows \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 etc/README.gnuplot \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 etc/README.kpathsea \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 etc/gdbinit
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 EXTRA_DIST += \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 etc/OLD-ChangeLogs/ChangeLog \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 etc/OLD-ChangeLogs/ChangeLog.1 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 etc/OLD-ChangeLogs/doc-ChangeLog \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 etc/OLD-ChangeLogs/libcruft-ChangeLog \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 etc/OLD-ChangeLogs/liboctave-ChangeLog \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 etc/OLD-ChangeLogs/scripts-ChangeLog \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 etc/OLD-ChangeLogs/src-ChangeLog \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 etc/OLD-ChangeLogs/test-ChangeLog
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 icon_IMAGE_FILES = \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 etc/icons/octave-logo.svg \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 etc/icons/octave-sombrero.png
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 icon_PNG_SIZES = \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 512 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 256 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 128 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 64 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 48 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 32 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 24 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 22 \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 16
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 BUILT_PNG_ICONS = $(patsubst %,etc/icons/octave-logo-%.png,$(icon_PNG_SIZES))
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 WINDOWS_PNG_ICONS = $(filter %-16.png %-32.png %-48.png %-256.png,$(BUILT_PNG_ICONS))
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 BUILT_ICONS = \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 $(BUILT_PNG_ICONS) \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 etc/icons/octave-logo.ico
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 EXTRA_DIST += \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 $(BUILT_ICONS) \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 $(icon_IMAGE_FILES) \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 etc/icons/octave.appdata.xml.in \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 etc/icons/octave.desktop.in
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53
20363
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 20342
diff changeset
54 image_DATA += \
20341
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55 $(icon_IMAGE_FILES) \
20342
c3c1fb44f9b5 eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
56 etc/icons/octave-logo.ico
20341
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58 VENDOR = www.octave.org
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59
20342
c3c1fb44f9b5 eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
60 DIRSTAMP_FILES += \
c3c1fb44f9b5 eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
61 etc/icons/$(octave_dirstamp)
c3c1fb44f9b5 eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
62
20368
23172e987766 Fix 'make install' errors for non-recursive build
Mike Miller <mtmiller@octave.org>
parents: 20363
diff changeset
63 all-local: all-icons
23172e987766 Fix 'make install' errors for non-recursive build
Mike Miller <mtmiller@octave.org>
parents: 20363
diff changeset
64
20341
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65 all-icons: etc/icons/octave.appdata.xml etc/icons/octave.desktop $(BUILT_ICONS)
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66
20368
23172e987766 Fix 'make install' errors for non-recursive build
Mike Miller <mtmiller@octave.org>
parents: 20363
diff changeset
67 etc/icons/octave.appdata.xml: etc/icons/octave.appdata.xml.in Makefile etc/icons/$(octave_dirstamp)
20341
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 $(AM_V_GEN)rm -f $@-t $@ && \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69 $(SED) < $< > $@-t \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
70 -e "s|%OCTAVE_DESKTOP_FILE%|${VENDOR}-octave.desktop|" && \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 mv $@-t $@
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72
20342
c3c1fb44f9b5 eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
73 etc/icons/octave.desktop: etc/icons/octave.desktop.in Makefile etc/icons/$(octave_dirstamp)
20341
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
74 $(AM_V_GEN)rm -f $@-t $@ && \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75 $(SED) < $< > $@-t \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 -e "s|%OCTAVE_IMAGEDIR%|${imagedir}|" \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77 -e "s|%OCTAVE_PREFIX%|${prefix}|" && \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78 mv $@-t $@
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79
20342
c3c1fb44f9b5 eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
80 $(BUILT_PNG_ICONS): etc/icons/octave-logo.svg etc/icons/$(octave_dirstamp)
20341
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
81 $(AM_V_GEN)rm -f $@-t $@ && \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82 $(RSVG_CONVERT) -w $(lastword $(subst -, ,$(patsubst %.png,%,$@))) $< > $@-t && \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 mv $@-t $@
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84
20342
c3c1fb44f9b5 eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
85 etc/icons/octave-logo.ico: $(WINDOWS_PNG_ICONS) etc/icons/$(octave_dirstamp)
20341
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
86 $(AM_V_GEN)rm -f $@-t $@ && \
20342
c3c1fb44f9b5 eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
87 $(ICOTOOL) --create --raw $(WINDOWS_PNG_ICONS) > $@-t && \
20341
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
88 mv $@-t $@
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
89
20368
23172e987766 Fix 'make install' errors for non-recursive build
Mike Miller <mtmiller@octave.org>
parents: 20363
diff changeset
90 install-data-local: install-icons
23172e987766 Fix 'make install' errors for non-recursive build
Mike Miller <mtmiller@octave.org>
parents: 20363
diff changeset
91
23172e987766 Fix 'make install' errors for non-recursive build
Mike Miller <mtmiller@octave.org>
parents: 20363
diff changeset
92 uninstall-local: uninstall-icons
23172e987766 Fix 'make install' errors for non-recursive build
Mike Miller <mtmiller@octave.org>
parents: 20363
diff changeset
93
20341
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
94 install-icons:
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
95 -if test -n "$(DESKTOP_FILE_INSTALL)"; then \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
96 $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \
20368
23172e987766 Fix 'make install' errors for non-recursive build
Mike Miller <mtmiller@octave.org>
parents: 20363
diff changeset
97 --vendor $(VENDOR) etc/icons/octave.desktop; \
20341
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
98 fi
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
99 for f in $(BUILT_PNG_ICONS); do \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
100 size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
101 if test -f $$f; then d=; else d="$(srcdir)/etc/icons/"; fi; \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
102 $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
103 $(INSTALL_DATA) "$$d$$f" $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/octave.png; \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
104 done
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
105 $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
106 $(INSTALL_DATA) $(srcdir)/etc/icons/octave-logo.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/octave.svg
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
107 $(MKDIR_P) $(DESTDIR)$(datadir)/appdata
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
108 $(INSTALL_DATA) etc/icons/octave.appdata.xml $(DESTDIR)$(datadir)/appdata/$(VENDOR)-octave.appdata.xml
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
109
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
110 uninstall-icons:
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
111 if test -n "$(DESKTOP_FILE_INSTALL)"; then \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
112 rm -f $(DESTDIR)$(datadir)/applications/$(VENDOR)-octave.desktop; \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
113 fi
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
114 for f in $(BUILT_PNG_ICONS); do \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
115 size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
116 rm -f $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/octave.png; \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
117 done
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
118 rm -f $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/octave.svg
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
119 rm -f $(DESTDIR)$(datadir)/appdata/$(VENDOR)-octave.appdata.xml
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
120
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
121 CLEANFILES += \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
122 etc/icons/octave.appdata.xml \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
123 etc/icons/octave.desktop
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
124
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
125 MAINTAINERCLEANFILES += \
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
126 $(BUILT_ICONS)
47d704435aa4 eliminate recursive make invocation in etc/icons directory
John W. Eaton <jwe@octave.org>
parents:
diff changeset
127