From af9c16ff2657a0ef52b1fad917e938e0401bc728 Mon Sep 17 00:00:00 2001 From: konablend <kona8lend@gmail.com> Date: Wed, 4 Jan 2012 18:48:58 +0000 Subject: [PATCH] BuildSystem: Mac OS X - fix pkg.create to use correct minver .dmg naming Replace hardcoded .5 naming for product .dmg files with value derived from $(GCC.minver) or blank if none is specified. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4397 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- pkg/darwin/module.defs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/darwin/module.defs b/pkg/darwin/module.defs index a8e8b7a8a..1281b9cbf 100644 --- a/pkg/darwin/module.defs +++ b/pkg/darwin/module.defs @@ -1,8 +1,10 @@ -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.platname = MacOSX$(suffix $(GCC.minver)) -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 +PKG.cli.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-$(PKG.platname)_CLI_$(BUILD.arch).dmg +PKG.gui.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-$(PKG.platname)_GUI_$(BUILD.arch).dmg + +PKG.cli.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-$(PKG.platname)_CLI_$(BUILD.arch).tmp.dmg +PKG.gui.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-$(PKG.platname)_GUI_$(BUILD.arch).tmp.dmg STAGE.out.cli/ = $(STAGE.out/)cli/ STAGE.out.gui/ = $(STAGE.out/)gui/ -- 2.40.0