diff options
| author | fanquake <fanquake@gmail.com> | 2022-01-05 12:37:09 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-04-05 14:49:23 +0100 |
| commit | dac693671928aa3fc304e6a802abfffb2f4ec8fd (patch) | |
| tree | 44b1fea6af92e3d347a4201d1f6508e8a605a7d2 /Makefile.am | |
| parent | f421de5be611f874a027392d5fee7e113dce4f54 (diff) | |
| download | bitcoin-dac693671928aa3fc304e6a802abfffb2f4ec8fd.tar.xz | |
build: perform all .tiff copying in macdeployqtplus
By copying the .tiff earlier in the macdeploy process, we can unify the logic in
the deploy script.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 8637af362e..eacd70c2bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,6 @@ OSX_APP=Bitcoin-Qt.app OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME)) OSX_DMG = $(OSX_VOLNAME).dmg OSX_TEMP_ISO = $(OSX_DMG:.dmg=).temp.iso -OSX_BACKGROUND_IMAGE=$(top_srcdir)/contrib/macdeploy/background.tiff OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed @@ -129,7 +128,7 @@ $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) deploydir: $(OSX_DMG) else !BUILD_DARWIN APP_DIST_DIR=$(top_builddir)/dist -APP_DIST_EXTRAS=$(APP_DIST_DIR)/.background/background.tiff $(APP_DIST_DIR)/.DS_Store $(APP_DIST_DIR)/Applications +APP_DIST_EXTRAS=$(APP_DIST_DIR)/.DS_Store $(APP_DIST_DIR)/Applications $(APP_DIST_DIR)/Applications: @rm -f $@ @@ -143,10 +142,6 @@ $(OSX_TEMP_ISO): $(APP_DIST_EXTRAS) $(OSX_DMG): $(OSX_TEMP_ISO) $(DMG) dmg "$<" "$@" -$(APP_DIST_DIR)/.background/background.tiff: - $(MKDIR_P) $(@D) - cp $(OSX_BACKGROUND_IMAGE) $@ - $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR) |