# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1275790656 0
# Node ID bed884491864057f35e387045667c708e4d7312b
# Parent  d88c15d3d8faa07fd164478920e8a6e50732a68d# Parent  9e7fc6d8ee18c01a70279cf73825770966264fe2
merge of '52f4817b6a7b2db5cad41758c4911c0f20f77eb2'
     and 'dfe958320740154e5d306f62dd8e7d260970ec29'

diff -r 9e7fc6d8ee18 -r bed884491864 Makefile.am
--- a/Makefile.am	Sun Jun 06 02:15:40 2010 +0000
+++ b/Makefile.am	Sun Jun 06 02:17:36 2010 +0000
@@ -136,7 +136,7 @@
 if HAVE_XSLTPROC
 	@echo "Generating devhelp index..."
 	@xsltproc $(top_srcdir)/doxy2devhelp.xsl doc/xml/index.xml > doc/html/pidgin.devhelp
-	@echo "(Symlink doc/html to ~/.local/share/gtk-doc/html/pidgin to make devhelp see the documentation)"
+	@echo "(Symlink $$(pwd)/doc/html to ~/.local/share/gtk-doc/html/pidgin to make devhelp see the documentation)"
 else
 	@echo "Not generating devhelp index: xsltproc was not found by configure"
 endif
diff -r 9e7fc6d8ee18 -r bed884491864 pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw	Sun Jun 06 02:15:40 2010 +0000
+++ b/pidgin/Makefile.mingw	Sun Jun 06 02:17:36 2010 +0000
@@ -162,7 +162,7 @@
 $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(PIDGIN_OBJECTS)
 	$(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(PIDGIN_LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll
 
-$(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(EXE_OBJECTS)
+$(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(EXE_OBJECTS) $(PIDGIN_TARGET).dll
 	$(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET).exe
 
 ##