diff options
| author | fanquake <fanquake@gmail.com> | 2022-01-05 12:53:23 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-04-05 14:49:32 +0100 |
| commit | 3d415215699e718b3f6eea6e3c9fb2948476f930 (patch) | |
| tree | e587a4361669894ad3e45537290b9cbb59bc947b /Makefile.am | |
| parent | dac693671928aa3fc304e6a802abfffb2f4ec8fd (diff) | |
| download | bitcoin-3d415215699e718b3f6eea6e3c9fb2948476f930.tar.xz | |
build: perform /Applications symlink generation in macdeployqtplus
By generating the symlink earlier in the macdeploy process, we can unify the
logic in the deploy script.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index eacd70c2bf..54e9a6865f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -128,15 +128,8 @@ $(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)/.DS_Store $(APP_DIST_DIR)/Applications -$(APP_DIST_DIR)/Applications: - @rm -f $@ - @cd $(@D); $(LN_S) /Applications $(@F) - -$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt - -$(OSX_TEMP_ISO): $(APP_DIST_EXTRAS) +$(OSX_TEMP_ISO): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ $(APP_DIST_DIR) -- $(if $(SOURCE_DATE_EPOCH),-volume_date all_file_dates =$(SOURCE_DATE_EPOCH)) $(OSX_DMG): $(OSX_TEMP_ISO) @@ -145,7 +138,7 @@ $(OSX_DMG): $(OSX_TEMP_ISO) $(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) -deploydir: $(APP_DIST_EXTRAS) +deploydir: $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt endif !BUILD_DARWIN appbundle: $(OSX_APP_BUILT) |