diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-05-01 13:05:06 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-01 13:05:06 +0200 |
| commit | 93e11e4fb697aaea63c99308f980e4c932bd1efa (patch) | |
| tree | 1892e49932d8d7b7656ae504113a40e4e39f876f /solenv/gbuild | |
| parent | a5b6a379a2d628040db98060c2adfe8f2fac5607 (diff) | |
| parent | c6786add5a58268e11aa027c47054344040db1bc (diff) | |
Merge tag 'libreoffice-4.0.3.2' into suse-4.0
Tag libreoffice-4.0.3.2
Conflicts:
basic/qa/cppunit/test_vba.cxx
basic/source/runtime/step2.cxx
dictionaries
helpcontent2
instsetoo_native/util/openoffice.lst
libvisio/UnpackedTarball_visio.mk
sc/source/ui/vba/vbaapplication.cxx
sc/source/ui/vba/vbavalidation.cxx
solenv/inc/minor.mk
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
translations
Change-Id: Ic1f06489175f3db92d6bbcebb9732fadc1c61fed
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/Deliver.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index 0f257e5b9814..1e0fef51b8f9 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -60,7 +60,7 @@ endif endef define gb_Deliver__deliver -$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch -r $(1) $(2) +$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch $(if $(filter-out MACOSX,$(OS_FOR_BUILD)),--no-dereference) -r $(1) $(2) endef ifneq ($(strip $(gb_Deliver_GNUCOPY)),) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 1178445bab70..6d6438f0f979 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -339,7 +339,7 @@ endef # JunitTest class ifneq ($(OOO_TEST_SOFFICE),) -gb_JunitTest_SOFFICEARG:=$(OOO_TEST_SOFFICE) +gb_JunitTest_SOFFICEARG:=$(OOO_TEST_SOFFICE) else ifneq ($(gb_JunitTest_DEBUGRUN),) gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER) |