Mercurial > pidgin

changeset 23336:dd21962a8a1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
re-Fix win32 build.
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 09 Jun 2008 17:28:08 +0000
parents a7711cdafa6b
children 96dd27f5b45b
files libpurple/win32/global.mak share/ca-certs/Makefile.mingw
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/win32/global.mak	Mon Jun 09 14:34:43 2008 +0000
+++ b/libpurple/win32/global.mak	Mon Jun 09 17:28:08 2008 +0000
@@ -112,4 +112,4 @@
 MINGW_MAKEFILE := Makefile.mingw
 
 INSTALL_PIXMAPS ?= 1
-
+INSTALL_SSL_CERTIFICATES ?= 1
--- a/share/ca-certs/Makefile.mingw	Mon Jun 09 14:34:43 2008 +0000
+++ b/share/ca-certs/Makefile.mingw	Mon Jun 09 17:28:08 2008 +0000
@@ -8,8 +8,8 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir := $(PIDGIN_INSTALL_DIR)
+-include ./Makefile.am.mingw
 cacertsdir := $(PIDGIN_INSTALL_DIR)/ca-certs
--include ./Makefile.am.mingw
 
 .PHONY: install
 
@@ -21,4 +21,4 @@
 
 ./Makefile.am.mingw: ./Makefile.am
 	sed -e 's/^if\ INSTALL_SSL_CERTIFICATES/ifeq (\$$(INSTALL_SSL_CERTIFICATES), 1)/' ./Makefile.am > $@
-	include $@
+