extensions/WinResTarget_activex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 2bb13b83e40aec362964d26921a3fc1660a5da2f Author: Michael Stahl <[email protected]> Date: Thu Feb 28 20:17:25 2013 +0100 extensions: WinResTarget_activex: use absolute paths This does not build from the top-level because it uses a relative path; the command invoked from "make" runs in the top-level dir while the command invoked from "make extensions" runs in the extensions/ dir, so we have to use absolute path here. Presumably the weird substitution going on here is just a relic from the days when WORKDIR was variously converted with cygpath. Change-Id: I73a61699ec0394bd40e63864f3e9f566c7d28a32 diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk index e7c87d9..41db1db 100644 --- a/extensions/WinResTarget_activex.mk +++ b/extensions/WinResTarget_activex.mk @@ -44,7 +44,7 @@ $(eval $(call gb_WinResTarget_set_rcfile,activex_res,extensions/source/activex/s $(eval $(call gb_WinResTarget_add_defs,activex_res,\ $$(DEFS) \ - -DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(SRCDIR),../../..,$(WORKDIR)/CustomTarget/extensions/source/activex/idl)) \ + -DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(WORKDIR)/CustomTarget/extensions/source/activex/idl) \ )) # vim:set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
