summaryrefslogtreecommitdiff
path: root/libwps
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-05-24 14:58:31 +0200
committerDavid Tardon <dtardon@redhat.com>2013-05-24 16:52:02 +0200
commit6f9d8211a13c51019835c62043193c0573e525b2 (patch)
treed89e5e7908ee176792256a7f712d8305e882043d /libwps
parentc51a2542f52f99488f31beb90067586af3075b5b (diff)
stop delivering libwps headers
Yes, I am impatient .-) Change-Id: Ic3a51ffc0a151e8ae71f8d2ff067ea4c3ad1c6b2
Diffstat (limited to 'libwps')
-rw-r--r--libwps/ExternalPackage_libwps.mk5
-rw-r--r--libwps/UnpackedTarball_libwps.mk7
2 files changed, 7 insertions, 5 deletions
diff --git a/libwps/ExternalPackage_libwps.mk b/libwps/ExternalPackage_libwps.mk
index 995ec7c8a856..960ae1b45aa9 100644
--- a/libwps/ExternalPackage_libwps.mk
+++ b/libwps/ExternalPackage_libwps.mk
@@ -9,11 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,libwps,libwps))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libwps,inc/external/libwps,\
- src/lib/libwps.h \
- src/lib/WPSDocument.h \
-))
-
$(eval $(call gb_ExternalPackage_use_external_project,libwps,libwps))
ifeq ($(OS)$(COM),WNTMSC)
diff --git a/libwps/UnpackedTarball_libwps.mk b/libwps/UnpackedTarball_libwps.mk
index 1fd633acbe90..7c31bf87ef41 100644
--- a/libwps/UnpackedTarball_libwps.mk
+++ b/libwps/UnpackedTarball_libwps.mk
@@ -11,4 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libwps))
$(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
+# HACK to avoid the need to deliver the headers to $(OUTDIR). This
+# should be removed when libwps is updated.
+$(eval $(call gb_UnpackedTarball_set_post_action,libwps,\
+ mkdir -p inc/libwps && \
+ cp -f src/lib/libwps.h src/lib/WPSDocument.h inc/libwps \
+))
+
# vim: set noet sw=4 ts=4: