Index: branches/2014Q4/graphics/ida/files/patch-mk__Autoconf.mk
===================================================================
--- branches/2014Q4/graphics/ida/files/patch-mk__Autoconf.mk	(revision 370453)
+++ branches/2014Q4/graphics/ida/files/patch-mk__Autoconf.mk	(revision 370454)
@@ -1,24 +1,25 @@
---- mk/Autoconf.mk.orig	2008-06-09 17:56:36.000000000 +0300
-+++ mk/Autoconf.mk	2009-05-28 08:51:09.000000000 +0300
-@@ -109,7 +109,7 @@
+--- mk/Autoconf.mk.orig	2012-02-22 17:13:36 UTC
++++ mk/Autoconf.mk
+@@ -110,20 +110,14 @@
  #	$(call ac_fini))
  ac_lib64 = $(shell \
  	$(call ac_init,for libdir name);\
 -	$(call ac_s_cmd,/sbin/ldconfig -p | grep -q lib64 &&\
 +	$(call ac_s_cmd,$(CC) -print-search-dirs | grep -q lib64 &&\
  		echo "lib64" || echo "lib");\
  	$(call ac_fini))
  
-@@ -118,9 +118,9 @@
+ # check for x11 ressource dir prefix
+ ac_resdir = $(shell \
  	$(call ac_init,for X11 app-defaults prefix);\
- 	$(call ac_s_cmd, for dir in \
- 		/etc/X11/app-defaults \
+-	$(call ac_s_cmd, for dir in \
+-		/etc/X11/app-defaults \
 -		/usr/X11R6/lib/X11/app-defaults \
 -		/usr/share/X11/app-defaults \
 -		/usr/lib/X11/app-defaults \
-+		${PREFIX}/lib/X11/app-defaults \
-+		${PREFIX}/share/X11/app-defaults \
-+		${PREFIX}/lib/X11/app-defaults \
- 		; do test -d "$$dir" || continue;\
- 		dirname "$$dir"; break; done);\
+-		; do test -d "$$dir" || continue;\
+-		dirname "$$dir"; break; done);\
++	$(call ac_s_cmd, dirname "${PREFIX}/lib/X11/app-defaults");\
  	$(call ac_fini))
+ 
+ # check if package is installed, via pkg-config
Index: branches/2014Q4
===================================================================
--- branches/2014Q4	(revision 370453)
+++ branches/2014Q4	(revision 370454)

Property changes on: branches/2014Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r370229