Fix output file for xca-icons.icns

When building out of tree, iconutil must be told the target file.
This commit is contained in:
Christian Hohnstädt 2021-05-11 08:24:59 +02:00
parent 00e592d8f3
commit 133e1de176
2 changed files with 4 additions and 3 deletions

View File

@ -114,7 +114,7 @@ clean:
rm -f lang/*.xml lang/.build-stamp misc/dn.txt misc/eku.txt
rm -f commithash.h misc/oids.txt misc/variables.wxi doc/xca.1
rm -f xca$(SUFFIX) *.dmg xca-portable*.zip msi-installer-dir*.zip xca*.msi
rm -rf xca-$(VERSION)* msi-installer-dir-$(VERSION)* xca-portable-$(VERSION)* doc/html/ doc/qthelp/ doc/sphinx
rm -rf xca-$(VERSION)* msi-installer-dir-$(VERSION)* xca-portable-$(VERSION)* doc/html/ doc/qthelp/ doc/sphinx AppStore xca.app
distclean: clean
rm -f local.h Local.mak config.log config.status misc/Info.plist

View File

@ -19,7 +19,7 @@ PIXMAPS = xca-32x32.xpm
ICONDIR = $(datadir)/icons/hicolor
install: install-pixmaps $(ICONS) $(ICONS_SRC)
.install-stamp: $(PIXMAPS) $(ICONS_SRC)
.install-stamp: $(PIXMAPS) $(ICONS_SRC) xca-icons.icns
install-pixmaps: $(PIXMAPS)
install -d $(DESTDIR)$(datadir)/pixmaps/
@ -42,7 +42,8 @@ w32res.o: w32res.rc xca.ico
$(WINDRES) $< $@
xca-icons.icns: xca-icons.iconset
iconutil --convert icns $^
@$(PRINT) " ICNS $@"
iconutil --convert icns -o $@ $^
app: xca-icons.icns
mkdir -p $(APPDIR)/Resources