[Libreoffice-commits] .: Makefile.top

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Nov 29 03:32:22 PST 2012


 Makefile.top |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aedac4f3827b82cf129a575cbf35c9737fab603a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 29 12:30:04 2012 +0100

    a module is either dmake or gbuild, so error out now

diff --git a/Makefile.top b/Makefile.top
index f2ae0c3..a281f10 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -37,7 +37,7 @@ $(WORKDIR)/modules.mk:
 
 include $(WORKDIR)/modules.mk
 include $(SRCDIR)/solenv/gbuild/Output.mk
-$(if $(filter $(gbuild_modules),$(dmake_modules)),$(eval $(call gb_Output_info,The following modules claim to be both dmake and gbuild: $(filter $(gbuild_modules),$(dmake_modules)))))
+$(if $(filter $(gbuild_modules),$(dmake_modules)),$(eval $(call gb_Output_error,The following modules claim to be both dmake and gbuild: $(filter $(gbuild_modules),$(dmake_modules)))))
 
 export gb_TAILBUILDTARGET=all slowcheck
 


More information about the Libreoffice-commits mailing list