From 133e1de1763386d186ea507e9078bb3ebfb16fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Hohnst=C3=A4dt?= Date: Tue, 11 May 2021 08:24:59 +0200 Subject: [PATCH] Fix output file for xca-icons.icns When building out of tree, iconutil must be told the target file. --- Makefile | 2 +- img/Makefile | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a1c2a694..9beeccf4 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/img/Makefile b/img/Makefile index ced07c7a..37b75c1f 100644 --- a/img/Makefile +++ b/img/Makefile @@ -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