Commit 3d58566d51312d3acdf2093fa7a6d238f4a4b412
1 parent
fd83102d
Exists in
master
and in
3 other branches
Installing svg icon.
Showing
3 changed files
with
21 additions
and
2 deletions
Show diff stats
.gitignore
branding/Makefile.in
| ... | ... | @@ -44,6 +44,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ |
| 44 | 44 | CONVERT=@CONVERT@ |
| 45 | 45 | OPTIPNG=@OPTIPNG@ |
| 46 | 46 | DESKTOP_INSTALL=@DESKTOP_INSTALL@ |
| 47 | +SCOUR=@SCOUR@ | |
| 47 | 48 | |
| 48 | 49 | #---[ Rules ]---------------------------------------------------------------------------- |
| 49 | 50 | |
| ... | ... | @@ -107,6 +108,20 @@ $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.png: \ |
| 107 | 108 | @$(MKDIR) `dirname $@` |
| 108 | 109 | @$(INSTALL_DATA) $< $@ |
| 109 | 110 | |
| 111 | +$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.svg: \ | |
| 112 | + %.svg | |
| 113 | + | |
| 114 | + @echo $@ ... | |
| 115 | + @$(MKDIR) `dirname $@` | |
| 116 | + | |
| 117 | +ifeq ($(SCOUR),no) | |
| 118 | + @$(INSTALL_DATA) $< $@ | |
| 119 | +else | |
| 120 | + @$(SCOUR) -i $< -o $@ | |
| 121 | +endif | |
| 122 | + | |
| 123 | + @chmod 644 $@ | |
| 124 | + | |
| 110 | 125 | $(DESTDIR)$(datarootdir)/pixmaps/%.png: \ |
| 111 | 126 | $(BINDIR)/%.png |
| 112 | 127 | |
| ... | ... | @@ -119,6 +134,7 @@ install: \ |
| 119 | 134 | |
| 120 | 135 | install-linux: \ |
| 121 | 136 | $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png \ |
| 137 | + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).svg \ | |
| 122 | 138 | $(DESTDIR)$(datarootdir)/pixmaps/$(PRODUCT_NAME).png \ |
| 123 | 139 | $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.png |
| 124 | 140 | |
| ... | ... | @@ -138,11 +154,11 @@ install-linux: \ |
| 138 | 154 | mime.xml \ |
| 139 | 155 | $(DESTDIR)$(datarootdir)/mime/packages/$(PRODUCT_NAME).xml |
| 140 | 156 | |
| 141 | - @$(MKDIR) $(DESTDIR)$(datarootdir)/metainfo | |
| 157 | + @$(MKDIR) $(DESTDIR)$(datarootdir)/appdata | |
| 142 | 158 | |
| 143 | 159 | @$(INSTALL_DATA) \ |
| 144 | 160 | appdata.xml \ |
| 145 | - $(DESTDIR)$(datarootdir)/metainfo/$(PRODUCT_NAME).appdata.xml | |
| 161 | + $(DESTDIR)$(datarootdir)/appdata/$(PRODUCT_NAME).appdata.xml | |
| 146 | 162 | |
| 147 | 163 | install-windows: \ |
| 148 | 164 | $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png \ | ... | ... |
configure.ac
| ... | ... | @@ -141,6 +141,8 @@ AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) |
| 141 | 141 | AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) |
| 142 | 142 | AC_PATH_TOOL([VALGRIND], [valgrind], [no]) |
| 143 | 143 | |
| 144 | +AC_PATH_TOOL([SCOUR], [scour], [no]) | |
| 145 | + | |
| 144 | 146 | AC_PATH_TOOL([DESKTOP_INSTALL],[desktop-file-install],[no]) |
| 145 | 147 | |
| 146 | 148 | PKG_CHECK_EXISTS | ... | ... |