pidgin: d232d797: Patch from dharding to allow pidgin to b...

datallah at pidgin.im datallah at pidgin.im
Tue Apr 15 12:26:01 EDT 2008


-----------------------------------------------------------------
Revision: d232d797aa7f444c80d47cf543f62a260c2b02b0
Ancestor: 68de6e97028824965d3e90f18544a45acc3c5891
Author: datallah at pidgin.im
Date: 2008-04-15T16:21:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d232d797aa7f444c80d47cf543f62a260c2b02b0

Modified files:
        libpurple/win32/targets.mak

ChangeLog: 

Patch from dharding to allow pidgin to be built on win32 using MSYS 1.0.10 which includes a version of sed that doesn't handle in-place replacement. Fixes #5527.

-------------- next part --------------
============================================================
--- libpurple/win32/targets.mak	6bbf6ba40cb81e2c21481693d135574986373b07
+++ libpurple/win32/targets.mak	d530ef12a30f8a3f4425e1687fea79601d3abe8c
@@ -12,11 +12,10 @@ $(PURPLE_VERSION_H): $(PURPLE_VERSION_H)
 	sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/' $@.in > $@
 
 $(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac
-	cp $@.in $@
 	awk 'BEGIN {FS="[\\(\\)\\[\\]]"} \
-	  /^m4_define..purple_major_version/ {system("sed -i -e s/@PURPLE_MAJOR_VERSION@/"$$5"/ $@");} \
-	  /^m4_define..purple_minor_version/ {system("sed -i -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@");} \
-	  /^m4_define..purple_micro_version/ {system("sed -i -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac
+	  /^m4_define..purple_major_version/ {system("sed -e s/@PURPLE_MAJOR_VERSION@/"$$5"/ $@.in > $@");} \
+	  /^m4_define..purple_minor_version/ {system("sed -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@ > $@.tmp & mv $@.tmp $@");} \
+	  /^m4_define..purple_micro_version/ {system("sed -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@ > $@.tmp & mv $@.tmp $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac
 
 $(PURPLE_DLL) $(PURPLE_DLL).a: $(PURPLE_VERSION_H)
 	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) libpurple.dll


More information about the Commits mailing list