When compiling under Windows, DISABLE_ACTIVEX was ignored.
Have fun,
Nico
setup_native/Module_setup_native.mk | 4 +++-
setup_native/source/packinfo/solariscopyrightfile | 0
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/setup_native/Module_setup_native.mk
b/setup_native/Module_setup_native.mk
index b74ac08..e6588f2 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -28,7 +28,9 @@ $(eval $(call gb_Module_add_targets,setup_native,\
Library_instooofiltmsi \
Library_qslnkmsi \
Library_reg4allmsdoc \
- Library_regactivex \
+ $(if $(DISABLE_ACTIVEX),,\
+ Library_regactivex \
+ ) \
Library_regpatchactivex \
Library_sdqsmsi \
Library_sellangmsi \
diff --git a/setup_native/source/packinfo/solariscopyrightfile
b/setup_native/source/packinfo/solariscopyrightfile
old mode 100755
new mode 100644
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
