diff options
Diffstat (limited to 'pkg/osx')
| -rw-r--r-- | pkg/osx/GNUmakefile | 9 | ||||
| -rw-r--r-- | pkg/osx/LauncherManager.m | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index 514a208d..d53a9981 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -78,10 +78,10 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) cp launcher "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/launcher" - ./cp-with-libs $(TOPLEVEL)/src/$(PACKAGE_TARNAME) "$(APP_BIN_DIR)" - $(STRIP) "$(APP_BIN_DIR)/$(PACKAGE_TARNAME)" - ./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)" - $(STRIP) "$(APP_BIN_DIR)/chocolate-setup" + ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)doom" + ./cp-with-libs $(TOPLEVEL)/setup/$(PROGRAM_PREFIX)setup "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup" $(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__ \ < $(TOPLEVEL)/man/INSTALL.template \ @@ -94,7 +94,6 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6" cp disk/dir.DS_Store $(STAGING_DIR)/.DS_Store cp disk/background.png $(STAGING_DIR)/background.png -# setfile -a V $(STAGING_DIR)/background.png clean : launcher_clean rm -f $(DMG) diff --git a/pkg/osx/LauncherManager.m b/pkg/osx/LauncherManager.m index 937c0d98..69c59577 100644 --- a/pkg/osx/LauncherManager.m +++ b/pkg/osx/LauncherManager.m @@ -294,8 +294,8 @@ static NSString *AppendQuotedFilename(NSString *str, NSString *fileName) return; } - ExecuteProgram(PACKAGE_TARNAME, [iwad UTF8String], - [args UTF8String]); + ExecuteProgram(PROGRAM_PREFIX "doom", [iwad UTF8String], + [args UTF8String]); [NSApp terminate:sender]; } @@ -306,7 +306,7 @@ static NSString *AppendQuotedFilename(NSString *str, NSString *fileName) [self saveConfig]; [self->iwadController setEnvironment]; - ExecuteProgram("chocolate-setup", NULL, NULL); + ExecuteProgram(PROGRAM_PREFIX "setup", NULL, NULL); } // Invoked when the "Terminal" option is selected from the menu, to open |