diff options
| author | konablend <[email protected]> | 2009-06-21 21:42:45 +0000 |
|---|---|---|
| committer | konablend <[email protected]> | 2009-06-21 21:42:45 +0000 |
| commit | 56314be38d30d4784aac574b25d0248d3593b052 (patch) | |
| tree | 3d7ee273bf02adae581ff357d37a1233b8e8173d | |
| parent | c98e0c8124731ef4839ebce09f9d06eef67c2c17 (diff) | |
BuildSystem: tweak Mac packaging
- use $(BUILD.arch) instead of $(BUILD.machine) for naming consistent with mach-o binary types.
- enable --launch-jobs=0 when doing special universal binary builds.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2593 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | make/variant/darwin.defs | 2 | ||||
| -rw-r--r-- | pkg/darwin/module.defs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/make/variant/darwin.defs b/make/variant/darwin.defs index 6ff2ff48d..4c9d06bb2 100644 --- a/make/variant/darwin.defs +++ b/make/variant/darwin.defs @@ -7,7 +7,7 @@ UB.BUILD = $(SRC/)configure --force --build=ub.$(1) --arch=$(1) --launch --launc ## linefeed is important define UB.BUILD.item - $(call UB.BUILD,$(1)) + $(call UB.BUILD,$(1)) --launch-jobs=0 endef diff --git a/pkg/darwin/module.defs b/pkg/darwin/module.defs index 719c296f6..a8e8b7a8a 100644 --- a/pkg/darwin/module.defs +++ b/pkg/darwin/module.defs @@ -1,8 +1,8 @@ -PKG.cli.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_CLI_$(BUILD.machine).dmg -PKG.gui.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_GUI_$(BUILD.machine).dmg +PKG.cli.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_CLI_$(BUILD.arch).dmg +PKG.gui.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_GUI_$(BUILD.arch).dmg -PKG.cli.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_CLI_$(BUILD.machine).tmp.dmg -PKG.gui.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_GUI_$(BUILD.machine).tmp.dmg +PKG.cli.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_CLI_$(BUILD.arch).tmp.dmg +PKG.gui.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_GUI_$(BUILD.arch).tmp.dmg STAGE.out.cli/ = $(STAGE.out/)cli/ STAGE.out.gui/ = $(STAGE.out/)gui/ |