# HG changeset patch
# User John D
# Date 1504321044 14400
# Node ID 1e9541065440a71868d4a0f2bd92a6f52bc06f29
# Parent  0234109dc9f43c7291b42b8a84e5f43aa031adab# Parent  ff4447e86c505e6950a9ebd3bb64e22d52815d89
maint: merged away extra head

diff -r 0234109dc9f4 -r 1e9541065440 src/libpng.mk
--- a/src/libpng.mk	Fri Sep 01 18:09:01 2017 -0700
+++ b/src/libpng.mk	Fri Sep 01 22:57:24 2017 -0400
@@ -3,8 +3,8 @@
 
 PKG             := libpng
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.6.31
-$(PKG)_CHECKSUM := de695064363df331734466981ef7f6546ef516bf
+$(PKG)_VERSION  := 1.6.32
+$(PKG)_CHECKSUM := 161d91d15cfd739773e0a73b41032b9f27322914
 $(PKG)_SUBDIR   := libpng-$($(PKG)_VERSION)
 $(PKG)_FILE     := libpng-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(subst .,,$(call SHORT_PKG_VERSION,$(PKG)))/$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -33,8 +33,9 @@
         $(ENABLE_SHARED_OR_STATIC) \
 	$($(PKG)_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' && $(CONFIGURE_POST_HOOK)
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= DESTDIR='$(3)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
 
-    rm -f '$(3)$(HOST_LIBDIR)/libpng.la'
-    rm -f '$(3)$(HOST_LIBDIR)/libpng15.la'
+    if [ ! "x$(MXE_NATIVE_BUILD)" = "xyes" ]; then \
+      $(LN_SF) '$(HOST_BINDIR)/libpng-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)libpng-config'; \
+    fi
 endef