diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-21 01:38:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:30 +0200 |
| commit | 4de7b4089ec6932dc4409ead886cfdda44bb1d53 (patch) | |
| tree | 086161191e0312e1ea595b8496019c58b3e5e476 | |
| parent | 1b736bf55e8ca79a06faabfa9866fffa6cab6c81 (diff) | |
unowinreg.dll is not in OOO layer
Change-Id: Ib22fcbe5e9427750196f11c512fd4d3134108731
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | odk/Package_unowinreg.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index 4f2a380e5de9..abe5e6eed25b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -449,6 +449,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ testtools_bridgetest \ testtools_constructors \ scqahelper \ + unowinreg \ )) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ @@ -612,7 +613,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ so_activex_x64 \ sysdtrans \ thidxmsi \ - unowinreg \ )) endif diff --git a/odk/Package_unowinreg.mk b/odk/Package_unowinreg.mk index 0fd09284721c..f253547b7035 100644 --- a/odk/Package_unowinreg.mk +++ b/odk/Package_unowinreg.mk @@ -9,7 +9,7 @@ ifeq ($(BUILD_UNOWINREG),YES) ifeq ($(COM),MSC) -odk_unowinreg_DIR := $(OUTDIR)/bin +odk_unowinreg_DIR := $(WORKDIR)/LinkTarget/Library else odk_unowinreg_DIR := $(call gb_CustomTarget_get_workdir,odk/unowinreg) endif |