pidgin: 2eb97f7d: Ugly hackery to support INSTALL_PIXMAPS ...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 2eb97f7d46ac5955e6a217661513d28e3b5ce060
Ancestor: 425e5ae23de1afd8f833d3f82c7f177f19930e41
Author: datallah at pidgin.im
Date: 2008-03-31T22:01:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2eb97f7d46ac5955e6a217661513d28e3b5ce060

Modified files:
        .mtn-ignore libpurple/win32/global.mak
        pidgin/pixmaps/Makefile.mingw
        pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
        pidgin/pixmaps/emotes/default/24/Makefile.mingw
        pidgin/pixmaps/emotes/none/Makefile.mingw

ChangeLog: 

Ugly hackery to support INSTALL_PIXMAPS for the win32 build.

-------------- next part --------------
============================================================
--- .mtn-ignore	04775d5c79030544344e571aca12f9470c32e5c0
+++ .mtn-ignore	278cf5e6d0b4a9338e91e8c0bee5d9b15099d5da
@@ -1,5 +1,6 @@
 (.*/)?\.svn
 .*/?Makefile(\.in)?$
+.*/?Makefile\.am\.mingw$
 (.*/)?TAGS$
 .*/?.*\.pc$
 .*/perl/common/[^/]+\.c$
============================================================
--- libpurple/win32/global.mak	2af530775996b37d6f9d0abd70acfac0bdfe948b
+++ libpurple/win32/global.mak	9b94e5995ae3edc30a3e8de4271e939441020fff
@@ -110,3 +110,6 @@ MINGW_MAKEFILE := Makefile.mingw
 PIDGIN_COMMON_RULES := $(PURPLE_TOP)/win32/rules.mak
 PIDGIN_COMMON_TARGETS := $(PURPLE_TOP)/win32/targets.mak
 MINGW_MAKEFILE := Makefile.mingw
+
+INSTALL_PIXMAPS ?= 1
+
============================================================
--- pidgin/pixmaps/Makefile.mingw	55d590dea4265547bd922b6f880bc7a538da6c76
+++ pidgin/pixmaps/Makefile.mingw	987e5c4dc7e0692a402155792c7cfb1bef4cb399
@@ -8,11 +8,11 @@ datadir := $(PIDGIN_INSTALL_DIR)
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir := $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
 .PHONY: install clean
 
-install:
+install: ./Makefile.am.mingw
 	if test '$(SUBDIRS)'; then \
 	  list='$(SUBDIRS)'; for subdir in $$list; do \
 	    $(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1 ;\
@@ -34,9 +34,14 @@ install:
 	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
 	fi;
 
-clean:
+clean: ./Makefile.am.mingw
 	if test '$(SUBDIRS)'; then \
 		list='$(SUBDIRS)'; for subdir in $$list; do \
 		$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) clean;\
 		done; \
 	fi;
+
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+
============================================================
--- pidgin/pixmaps/buddy_icons/qq/Makefile.mingw	e3ad1666c37933683eb54732a439624779aa797d
+++ pidgin/pixmaps/buddy_icons/qq/Makefile.mingw	f06cc0f009d18bec6785006440e258776a87943c
@@ -9,10 +9,15 @@ datadir = $(PIDGIN_INSTALL_DIR)
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir = $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
-install:
+install: ./Makefile.am.mingw
 	if test '$(qqbuddyiconspix_DATA)'; then \
 	  mkdir -p $(qqbuddyiconspixdir); \
 	  cp $(qqbuddyiconspix_DATA) $(qqbuddyiconspixdir); \
 	fi;
+
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+
============================================================
--- pidgin/pixmaps/emotes/default/24/Makefile.mingw	7f4ab6e6cfd469180d87b32cc8bae8f983a9e29d
+++ pidgin/pixmaps/emotes/default/24/Makefile.mingw	dff8500bdcbb4d98a1c8c69e5617d538b7896fe2
@@ -8,11 +8,11 @@ datadir = $(PIDGIN_INSTALL_DIR)
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir = $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
 .PHONY: install clean
 
-install: theme
+install: ./Makefile.am.mingw theme
 	if test '$(pidginsmileypix_DATA)'; then \
 	  mkdir -p $(pidginsmileypixdir); \
 	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
@@ -20,3 +20,8 @@ clean:
 
 clean:
 	rm -f theme
+
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+
============================================================
--- pidgin/pixmaps/emotes/none/Makefile.mingw	be95fe6cc77c9aa915f240dfeee05cc1defd2a54
+++ pidgin/pixmaps/emotes/none/Makefile.mingw	8b374ee6e1d72573b1198904b77b1c2c8f5f401f
@@ -8,11 +8,11 @@ datadir = $(PIDGIN_INSTALL_DIR)
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir = $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
 .PHONY: install clean
 
-install: theme
+install: ./Makefile.am.mingw theme
 	if test '$(pidginsmileypix_DATA)'; then \
 	  mkdir -p $(pidginsmileypixdir); \
 	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
@@ -21,3 +21,7 @@ clean:
 clean:
 	rm -f theme
 
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+