[Pkg-privacy-commits] [pidgin-otr] 04/04: Update Makefile.mingw for 3.2.1-2 Windows build

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to tag release_3_2_1-2
in repository pidgin-otr.

commit 46bbc3329c732671b7e3a48f8948bd628b4bc5b6
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Tue Aug 14 16:43:43 2012 -0400

    Update Makefile.mingw for 3.2.1-2 Windows build
---
 ChangeLog      |  5 +++++
 Makefile.mingw | 22 ++++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5192c38..642a58c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-08-14
 
+	* Makefile.mingw: bump PIDGIN_OTR_VERSION to 3.2.1-2 for linking
+	to libotr 3.2.1.
+
+	* Makefile.mingw: fix bug in make zip target.
+
 	* packaging/windows/pidgin-otr.nsi: bump exe release number to
 	3.2.1-2 for linking to libotr 3.2.1.
 
diff --git a/Makefile.mingw b/Makefile.mingw
index f4e4ca4..38af259 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,7 +1,7 @@
 WIN32=1
 
 # The version number to put in the plugin info
-PIDGIN_OTR_VERSION = 3.2.1
+PIDGIN_OTR_VERSION = 3.2.1-2
 
 # Name of the gettext domain
 GETTEXT_PACKAGE = pidgin-otr
@@ -20,15 +20,16 @@ GTK_WIN32_BUNDLE ?= /usr/i586-mingw32msvc/misc/gtk_bundle
 PIDGIN_WIN32_LIBS ?= /usr/i586-mingw32msvc/misc/pidgin_dlls
 
 # If you don't have pkg-config, uncomment the -I lines below
-GTK_HDRS ?= `pkg-config --cflags glib-2.0 gtk+-2.0`
-#GTK_HDRS ?= -I$(GTK_WIN32_BUNDLE)/include/gtk-2.0  \
-# -I$(GTK_WIN32_BUNDLE)/include/glib-2.0 \
-# -I$(GTK_WIN32_BUNDLE)/include/cairo \
-# -I$(GTK_WIN32_BUNDLE)/include/pango-1.0 \
-# -I$(GTK_WIN32_BUNDLE)/include/atk-1.0 \
-# -I$(GTK_WIN32_BUNDLE)/include/gdk-pixbuf-2.0 \
-# -I$(GTK_WIN32_BUNDLE)/lib/glib-2.0/include \
-# -I$(GTK_WIN32_BUNDLE)/lib/gtk-2.0/include
+#GTK_HDRS ?= `pkg-config --cflags glib-2.0 gtk+-2.0`
+GTK_HDRS ?= -I$(GTK_WIN32_BUNDLE)/include  \
+ -I$(GTK_WIN32_BUNDLE)/include/gtk-2.0  \
+ -I$(GTK_WIN32_BUNDLE)/include/glib-2.0 \
+ -I$(GTK_WIN32_BUNDLE)/include/cairo \
+ -I$(GTK_WIN32_BUNDLE)/include/pango-1.0 \
+ -I$(GTK_WIN32_BUNDLE)/include/atk-1.0 \
+ -I$(GTK_WIN32_BUNDLE)/include/gdk-pixbuf-2.0 \
+ -I$(GTK_WIN32_BUNDLE)/lib/glib-2.0/include \
+ -I$(GTK_WIN32_BUNDLE)/lib/gtk-2.0/include
 
 
 # The location of the libotr include files.  Note that if, for example,
@@ -116,6 +117,7 @@ installer: prepare_win32_export
 
 ## Package up all the pieces needed to build the installer
 zip: prepare_win32_export
+	cd win32_export; \
 	rm -f ../$(ZIPFILE); \
 	zip -r ../$(ZIPFILE) README.txt \
 		README.Toolkit.txt Protocol-v2.html COPYING.txt \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git