From 6832d176c02943e785a916f0ddd90949a9a36605 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Sat, 8 May 2004 09:58:21 +0000 Subject: [PATCH] Minor MacOS X fix. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1349 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/wx-console/Makefile.in | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in index 9873b36374..b6c3a1a2d5 100644 --- a/bacula/src/wx-console/Makefile.in +++ b/bacula/src/wx-console/Makefile.in @@ -31,11 +31,19 @@ win32 = wx-console_private.res WIN32RES = $(@WIN32@) +macosx = wx-console.app + +MACOSXAPP = $(@MACOSX@) + # these are the objects that are changed by the .configure process EXTRAOBJS = @OBJLIST@ +macosx_cppflags = -DHAVE_MACOSX -DNO_GCC_PRAGMA + +_cppflags = + # wx-config generated by configure -CONS_CPPFLAGS=@WXCONS_CPPFLAGS@ +CONS_CPPFLAGS=-DHAVE_WXCONSOLE @WXCONS_CPPFLAGS@ $(@MACOSX@_cppflags) CONS_LDFLAGS=@WXCONS_LDFLAGS@ .SUFFIXES: .cpp .c .o @@ -53,7 +61,7 @@ CONS_LDFLAGS=@WXCONS_LDFLAGS@ #------------------------------------------------------------------------- -all: Makefile wx-console +all: Makefile wx-console @MACOSXAPP@ @echo "==== Make of wx-console is good ====" @echo " " @@ -68,8 +76,7 @@ wx-console.app: wx-console -mkdir wx-console.app/Contents/Resources/English.lproj echo -n 'APPL????' > wx-console.app/Contents/PkgInfo mv wx-console wx-console.app/Contents/MacOS/wx-console - -mkdir /Library/Preferences/org.bacula.wxconsole - cp wx-console.conf /Library/Preferences/org.bacula.wxconsole/wx-console.conf + cp wx-console.conf /Library/Preferences/org.bacula.wxconsole.conf wx-console: $(CONSOBJS) @WIN32@ ../lib/libbac.a $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) -lbac -- 2.39.5