diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-11-04 10:48:25 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-11-04 10:48:25 +0000 |
| commit | f97e860a31ffb3535002e5cd31f37eb20eddc620 (patch) | |
| tree | c8776faf92610253c47f8f54d2d69f962c36cb7d | |
| parent | 1ffca0e2bc60f2a11d84a718f2968932eac32629 (diff) | |
#i106536# MacOSX: break at desktop: cp called without target (../unxmacxi.pro/bin/so/soffice_mac)
| -rw-r--r-- | desktop/source/pkgchk/unopkg/makefile.mk | 2 | ||||
| -rw-r--r-- | desktop/util/makefile.mk | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk index 3562fad961..4a1f409f45 100644 --- a/desktop/source/pkgchk/unopkg/makefile.mk +++ b/desktop/source/pkgchk/unopkg/makefile.mk @@ -49,6 +49,7 @@ PRJINC += ..$/..$/deployment ..$/.. CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) .ENDIF +.IF "$(LINK_SO)"!="" APP1TARGET = so$/unopkg APP1OBJS = $(OBJFILES) APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) @@ -59,6 +60,7 @@ APP1RPATH = BRAND APP1ICON = $(SOLARRESDIR)$/icons/so9_main_app.ico APP1LINKRES = $(MISC)$/$(TARGET)1.res .ENDIF +.ENDIF # "$(LINK_SO)"!="" APP2TARGET = unopkg APP2OBJS = $(OBJFILES) diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 4dec3cd738..78305523c4 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -287,22 +287,25 @@ $(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN) $(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN) $(COPY) $< $@ -ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) $(BIN)$/soffice_oo$(EXECPOST) -.ELSE -ALLTAR : $(BIN)$/soffice_oo$(EXECPOST) +ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) .ENDIF # "$(LINK_SO)"=="TRUE" +ALLTAR : $(BIN)$/soffice_oo$(EXECPOST) .ENDIF .IF "$(OS)" == "MACOSX" +.IF "$(LINK_SO)"=="TRUE" $(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN) $(COPY) $< $@ +ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST) +.ENDIF # "$(LINK_SO)"=="TRUE" + $(BIN)$/soffice_mac$(EXECPOST) : $(APP5TARGETN) $(COPY) $< $@ -ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST) $(BIN)$/soffice_mac$(EXECPOST) +ALLTAR : $(BIN)$/soffice_mac$(EXECPOST) -.ENDIF +.ENDIF # "$(OS)" == "MACOSX" .IF "$(GUI)" == "WNT" |