summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-09-21 01:38:54 +0200
committerMichael Stahl <mstahl@redhat.com>2013-09-21 19:23:43 +0200
commit938011f4510c0ed88d0a898001d752344df58c25 (patch)
tree7c0cb5a056c47d9629c8bdb8291188791a38336b
parent90cc3ce0795eddfa9664cc3fabe88efb6df38367 (diff)
unowinreg.dll is not in OOO layer
Change-Id: Ib22fcbe5e9427750196f11c512fd4d3134108731
-rw-r--r--Repository.mk2
-rw-r--r--odk/Package_unowinreg.mk2
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