planner r928 - trunk

[mvdpot svn gnome org]

Author: mvdpot
Date: Tue Jul 29 19:03:06 2008
New Revision: 928
URL: http://svn.gnome.org/viewvc/planner?rev=928&view=rev

Log:
2008-07-29  Maurice van der Pot  <griffon26 kfk4ever com>

	* Makefile.win32: Fix makefile for Windows to work with both libpng <=
	1.2.8, where the dll was named libpng13.dll, and libpng >= 1.2.29, where it
	is named libpng12-0.dll.



Modified:
   trunk/ChangeLog
   trunk/Makefile.win32

Modified: trunk/Makefile.win32
==============================================================================
--- trunk/Makefile.win32	(original)
+++ trunk/Makefile.win32	Tue Jul 29 19:03:06 2008
@@ -153,7 +153,6 @@
 	libpangocairo-1.0-0.dll		\
 	libpangoft2-1.0-0.dll		\
 	libpangowin32-1.0-0.dll		\
-	libpng13.dll			\
 	libxml2.dll			\
 	libxslt.dll			\
 	zlib1.dll
@@ -179,8 +178,17 @@
 
 createinstaller:
 	DESTDIR=$$(pwd)/$(INSTALLERTMP) $(MAKE) -f Makefile.win32 install
-	@LOADERSPATH=`grep "loaders/libpixbufloader" $(PREFIX)/etc/gtk-2.0/gdk-pixbuf.loaders|head -n1|sed -e 's#.*/\(lib/gtk-2.0/[^/]*/loaders\)/.*#\1#'`; \
-	GTK_TRANSLATIONS=`echo $(INSTALLERTMP)/planner/share/locale/*|sed -e "s#$(INSTALLERTMP)/planner##g"`; \
+	@LOADERSPATH=`grep "loaders/libpixbufloader" $(PREFIX)/etc/gtk-2.0/gdk-pixbuf.loaders | \
+		head -n1 | \
+		sed -e 's#.*/\(lib/gtk-2.0/[^/]*/loaders\)/.*#\1#'`; \
+	case `grep libpng $(PREFIX)/lib/pkgconfig/cairo.pc | \
+		sed -e 's/.*\(libpng[0-9]*\).*/\1/'` in \
+		libpng12) LIBPNG=/bin/libpng12-0.dll ;; \
+		libpng13) LIBPNG=/bin/libpng13.dll ;; \
+		*) echo "Unable to find libpng"; exit -1 ;; \
+	esac; \
+	GTK_TRANSLATIONS=`echo $(INSTALLERTMP)/planner/share/locale/* | \
+		sed -e "s#$(INSTALLERTMP)/planner##g"`; \
 	GTK_FILES="/etc/gtk-2.0/gdk-pixbuf.loaders \
 	         $${LOADERSPATH} \
 	         /etc/gtk-2.0/gtkrc \
@@ -189,6 +197,7 @@
 	         /share/libgnomeprint \
 	         /share/libgnomeprintui \
 	         $(addprefix /bin/,$(GTK_BINFILES)) \
+	         $${LIBPNG} \
 	         $(addprefix /share/icons/gnome/,$(GTK_ICONFILES)) \
 	         $${GTK_TRANSLATIONS}"; \
 	mkdir -p $(INSTALLERTMP)/planner; \