[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/pack
Andrea Pescetti
pescetti at apache.org
Sat Aug 29 15:08:06 PDT 2015
odk/pack/gendocu/makefile.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3dbd4c284e3282c6dfa9798162fc6d84d5b19c46
Author: Andrea Pescetti <pescetti at apache.org>
Date: Sat Aug 29 22:02:48 2015 +0000
#i126258# Fix build on systems using a recent version of GNU Patch.
Patch by: Alexander Pyhalov <alp at rsu.ru>
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 624bbea..a05c00f 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -112,7 +112,7 @@ $(JAVA_DOCU_INDEX_FILE) .SEQUENTIAL : $(JAVA_SRC_FILES)
-$(MKDIRHIER) $(@:d)
$(JAVADOC) -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)
.IF "$(OS)" != "MACOSX"
- patch $(JAVA_DOCU_INDEX_FILE) idl_ref_javadoc.patch
+ cd $(shell dirname $(JAVA_DOCU_INDEX_FILE)) && patch $(shell basename $(JAVA_DOCU_INDEX_FILE)) $(PWD)/idl_ref_javadoc.patch
.ENDIF
.ENDIF
More information about the Libreoffice-commits
mailing list