diff options
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/Module_odk.mk | 2 | ||||
| -rw-r--r-- | odk/Package_unowinreg.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 32bdfc1af8ea..50da7d2c7fb6 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -41,7 +41,7 @@ endif ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ - $(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \ + $(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\ CustomTarget_classes \ CustomTarget_javadoc \ GeneratedPackage_odk_javadoc \ diff --git a/odk/Package_unowinreg.mk b/odk/Package_unowinreg.mk index a62ddadebd04..189967eac22b 100644 --- a/odk/Package_unowinreg.mk +++ b/odk/Package_unowinreg.mk @@ -7,14 +7,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(BUILD_UNOWINREG),YES) +ifneq ($(BUILD_UNOWINREG),) ifeq ($(COM),MSC) odk_unowinreg_DIR := $(WORKDIR)/LinkTarget/Library else odk_unowinreg_DIR := $(call gb_CustomTarget_get_workdir,odk/unowinreg) endif odk_unowinreg_FILE := unowinreg.dll -else # BUILD_UNOWINREG=NO +else # !BUILD_UNOWINREG odk_unowinreg_DIR := $(TARFILE_LOCATION) odk_unowinreg_FILE := $(UNOWINREG_DLL) endif |