From 3122e5507860a3ef7b294ef61773002304cd3656 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 28 Aug 2007 08:18:12 +0000 Subject: INTEGRATION: CWS aquaremovescripts (1.3.56); FILE MERGED 2007/08/21 10:07:03 ericb 1.3.56.1: #i80882# remove main.applescript and postinstall.applescript + remove osacompile use --- instsetoo_native/macosx/makefile.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'instsetoo_native') diff --git a/instsetoo_native/macosx/makefile.mk b/instsetoo_native/macosx/makefile.mk index d2d15c74650a..74b889195127 100644 --- a/instsetoo_native/macosx/makefile.mk +++ b/instsetoo_native/macosx/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: ihi $ $Date: 2007-06-05 11:51:39 $ +# last change: $Author: vg $ $Date: 2007-08-28 09:18:12 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -53,9 +53,11 @@ BUNDLE = $(MISC)$/OpenOffice.org.app CONTENTS = $(BUNDLE)$/Contents VERSIONED = $(MISC)$/versioned +.IF "$(GUIBASE)"!="aqua" scriptfiles = \ $(CONTENTS)$/Resources$/Scripts$/main.scpt \ $(CONTENTS)$/Resources$/Scripts$/PostInstall.scpt +.ENDIF plistfiles = $(CONTENTS)$/Info.plist @@ -80,6 +82,7 @@ $(ZIP1TARGETN) : $(scriptfiles) $(plistfiles) $(plistfiles) : $(scriptfiles) +.IF "$(GUIBASE)"!="aqua" # create application bundle from apple script source # Info.plist will be deleted to trigger copy rule of our own Info.plist $(CONTENTS)$/Resources$/Scripts$/main.scpt : application/main.applescript @@ -93,6 +96,7 @@ $(CONTENTS)$/Resources$/Scripts$/%.scpt : application/%.applescript make_versioned.sh "$<" "$(VERSIONED)/$<" osacompile -d -o "$@" "$(VERSIONED)/$<" $(RM) "$(VERSIONED)/$<" +.ENDIF # "$(GUIBASE)"!="aqua" # Info.plist is just versioned and copied into the bundle $(CONTENTS)$/%.plist : application/%.plist -- cgit