1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index 931d6eea856e..2749b6930079 100644
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -29,7 +29,7 @@ endif
&& export \
UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,$(1))/user) \
$(foreach my_dir,$(2), \
- && (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \
+ && (cd /usr/lib/libreoffice/sdk/examples/$(my_dir) \
&& printf 'yes\n' | LC_ALL=C make \
$(if $(filter MACOSX,$(OS)), SHELL=$(ODK_BUILD_SHELL), )))) \
>$(call gb_CustomTarget_get_workdir,$(1))/log 2>&1 \
@@ -43,17 +43,17 @@ endif
endif
$(call gb_CustomTarget_get_workdir,$(1))/setsdkenv: \
- $(SRCDIR)/odk/config/setsdkenv_unix.sh.in \
+ /usr/lib/libreoffice/sdk//setsdkenv_unix.sh.in \
$(BUILDDIR)/config_$(gb_Side).mk | \
$(call gb_CustomTarget_get_workdir,$(1))/.dir
$$(call gb_Output_announce,$(subst $(WORKDIR)/,,$(1)),$(true),SED,1)
sed -e 's!@OO_SDK_NAME@!sdk!' \
- -e 's!@OO_SDK_HOME@!$(INSTDIR)/$(SDKDIRNAME)!' \
- -e 's!@OFFICE_HOME@!$(INSTROOTBASE)!' -e 's!@OO_SDK_MAKE_HOME@!!' \
+ -e 's!@OO_SDK_HOME@!/usr/lib/libreoffice/sdk!' \
+ -e 's!@OFFICE_HOME@!/usr/lib/libreoffice!' -e 's!@OO_SDK_MAKE_HOME@!!' \
-e 's!@OO_SDK_ZIP_HOME@!!' -e 's!@OO_SDK_CAT_HOME@!!' \
-e 's!@OO_SDK_SED_HOME@!!' -e 's!@OO_SDK_CPP_HOME@!!' \
-e 's!@OO_SDK_JAVA_HOME@!$(JAVA_HOME)!' \
- -e 's!@OO_SDK_OUTPUT_DIR@!$(call gb_CustomTarget_get_workdir,$(1))/out!' \
+ -e 's!@OO_SDK_OUTPUT_DIR@!$(shell mktemp -q -d)/out!' \
-e 's!@SDK_AUTO_DEPLOYMENT@!YES!' $$< > $$@
.PHONY: $(call gb_CustomTarget_get_target,$(1))
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 4073dcfd9bf5..68c17ce0d1ed 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -339,10 +339,6 @@ define gb_Module_add_subsequentcheck_target
$(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target)
$(call gb_Module_get_subsequentcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
-$$(gb_Module_CURRENTTARGET) :| \
- $(call gb_Postprocess_get_target,AllModulesButInstsetNative) \
- $(call gb_Package_get_target,instsetoo_native_setup) \
- $(call gb_Package_get_target,instsetoo_native_setup_ure)
$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
endef
|
