[Libreoffice-commits] core.git: external/libpng

[Lionel Elie Mamane]

 external/libpng/Module_libpng.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit ce40605a8f906ebb4d800798d1e0c17ded4c053a
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Oct 17 02:32:09 2013 +0000

    Revert "no need to double the conditional, once is enough"
    
    This reverts commit b63029c8072c10c03b2fc36fe82619f0cff0ca18
    
    This might be a bug in gb_Helper_optional or some such, but I get:
    
    make[1]: *** No rule to make target `/home/master/src/libreoffice/workdirs/master/src/9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz', needed by `/home/master/src/libreoffice/workdirs/master/workdir/unxlngx6/UnpackedTarget/9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz'.  Stop.
    make[1]: *** Waiting for unfinished jobs....
    make: *** [build] Error 2
    
    Change-Id: Ib9cd0cbe800f158bf50aaeb95f848cc2fd805de3
    Reviewed-on: https://gerrit.libreoffice.org/6287
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/external/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk
index afb0016..d61375d 100644
--- a/external/libpng/Module_libpng.mk
+++ b/external/libpng/Module_libpng.mk
@@ -9,9 +9,13 @@
 
 $(eval $(call gb_Module_Module,libpng))
 
+ifeq ($(SYSTEM_LIBPNG),NO)
+
 $(eval $(call gb_Module_add_targets,libpng,\
 	StaticLibrary_png \
 	UnpackedTarball_png \
 ))
 
+endif
+
 # vim: set noet sw=4 ts=4: