scp2/InstallModule_graphicfilter.mk | 4 ++++ scp2/source/ooo/file_library_ooo.scp | 1 - scp2/source/ooo/module_hidden_ooo.scp | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)
New commits: commit 8d08ba5e7530580afd61930bfc00ae513962b754 Author: David Tardon <dtar...@redhat.com> Date: Wed May 15 15:22:16 2013 +0200 install graphicfilter.xcd again Change-Id: I1091b4ff6b700513c7ef5ac41d94972dbb33dcb2 diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk index f166e25..8d6c5ee 100644 --- a/scp2/InstallModule_graphicfilter.mk +++ b/scp2/InstallModule_graphicfilter.mk @@ -11,6 +11,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter)) +$(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\ + scp2/source/graphicfilter/file_graphicfilter \ +)) + $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/graphicfilter,\ scp2/source/graphicfilter/module_graphicfilter \ )) commit 74c02547dde1f70a557c39e60bec129b93d2ecb5 Author: David Tardon <dtar...@redhat.com> Date: Wed May 15 14:40:00 2013 +0200 put auto-installed libs into the right module The definition of Auto_File_Libs_ALL was not known in module_hidden_ooo.scp, so it was left unexpanded and the unattached files were assigned to the gid_Module_Root. Change-Id: Ie7064da6e02394261a47e88526c073941625dc8c diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 2c51db4..29cb741 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -25,7 +25,6 @@ * ************************************************************************/ #include "macros.inc" -#include "AutoInstallLibs/ooo" #if defined SOLAR_JAVA && defined WNT File gid_File_Lib_Accessbridge diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index e26aa92..8f06a6e 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -26,6 +26,7 @@ ************************************************************************/ #include "macros.inc" +#include "AutoInstallLibs/ooo" #ifdef AIX #ifndef SYSTEM_CURL _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits