fix delivery of headers in ExternalPackages

Change-Id: Id686e9eeef9d64943360c6d7187f13b76a6c374a

libcdr/ExternalPackage_libcdr.mk

@@ -10,10 +10,10 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libcdr_inc,cdr))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr_inc,inc/external/libcdr,\
-	libcdr.h \
-	CDRDocument.h \
-	CDRStringVector.h \
-	CMXDocument.h \
+	src/lib/libcdr.h \
+	src/lib/CDRDocument.h \
+	src/lib/CDRStringVector.h \
+	src/lib/CMXDocument.h \
 ))
 
 # vim: set noet sw=4 ts=4:

libcmis/ExternalPackage_libcmis.mk

@@ -10,19 +10,19 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libcmis_inc,cmis))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libcmis_inc,inc/external/libcmis,\
-	allowable-actions.hxx \
-	document.hxx \
-	exception.hxx \
-	folder.hxx \
-	object-type.hxx \
-	object.hxx \
-	property-type.hxx \
-	property.hxx \
-	repository.hxx \
-	session-factory.hxx \
-	session.hxx \
-	xml-utils.hxx \
-	xmlserializable.hxx \
+	src/libcmis/allowable-actions.hxx \
+	src/libcmis/document.hxx \
+	src/libcmis/exception.hxx \
+	src/libcmis/folder.hxx \
+	src/libcmis/object-type.hxx \
+	src/libcmis/object.hxx \
+	src/libcmis/property-type.hxx \
+	src/libcmis/property.hxx \
+	src/libcmis/repository.hxx \
+	src/libcmis/session-factory.hxx \
+	src/libcmis/session.hxx \
+	src/libcmis/xml-utils.hxx \
+	src/libcmis/xmlserializable.hxx \
 ))
 
 # vim: set noet sw=4 ts=4:

libmspub/ExternalPackage_libmspub.mk

@@ -10,9 +10,9 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libmspub_inc,mspub))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub_inc,inc/external/libmspub,\
-	libmspub.h \
-	MSPUBDocument.h \
-	MSPUBStringVector.h \
+	src/lib/libmspub.h \
+	src/lib/MSPUBDocument.h \
+	src/lib/MSPUBStringVector.h \
 ))
 
 # vim: set noet sw=4 ts=4:

libwpd/ExternalPackage_libwpd.mk

@@ -10,20 +10,20 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libwpd_inc,wpd))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd,\
-	libwpd.h \
-	WPDocument.h \
-	WPXBinaryData.h \
-	WPXDocumentInterface.h \
-	WPXProperty.h \
-	WPXPropertyList.h \
-	WPXString.h \
-	WPXPropertyListVector.h \
+	src/lib/libwpd.h \
+	src/lib/WPDocument.h \
+	src/lib/WPXBinaryData.h \
+	src/lib/WPXDocumentInterface.h \
+	src/lib/WPXProperty.h \
+	src/lib/WPXPropertyList.h \
+	src/lib/WPXString.h \
+	src/lib/WPXPropertyListVector.h \
 ))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd-stream,\
-	libwpd-stream.h \
-	WPXStream.h \
-	WPXStreamImplementation.h \
+	src/lib/libwpd-stream.h \
+	src/lib/WPXStream.h \
+	src/lib/WPXStreamImplementation.h \
 ))
 
 # vim: set noet sw=4 ts=4:

libwpg/ExternalPackage_libwpg.mk

@@ -10,9 +10,9 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libwpg_inc,wpg))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpg_inc,inc/external/libwpg,\
-	libwpg.h \
-	WPGPaintInterface.h \
-	WPGraphics.h \
+	src/lib/libwpg.h \
+	src/lib/WPGPaintInterface.h \
+	src/lib/WPGraphics.h \
 ))
 
 # vim: set noet sw=4 ts=4:

libwps/ExternalPackage_libwps.mk

@@ -10,8 +10,8 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libwps_inc,wps))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libwps_inc,inc/external/libwps,\
-	libwps.h \
-	WPSDocument.h \
+	src/lib/libwps.h \
+	src/lib/WPSDocument.h \
 ))
 
 # vim: set noet sw=4 ts=4: