SOURCES: openttd-libiconv.patch - adjust for 0.0.7

lisu lisu at pld-linux.org
Fri Apr 3 10:47:22 CEST 2009


Author: lisu                         Date: Fri Apr  3 08:47:22 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adjust for 0.0.7

---- Files affected:
SOURCES:
   openttd-libiconv.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/openttd-libiconv.patch
diff -u SOURCES/openttd-libiconv.patch:1.1 SOURCES/openttd-libiconv.patch:1.2
--- SOURCES/openttd-libiconv.patch:1.1	Sat Jun  7 19:09:58 2008
+++ SOURCES/openttd-libiconv.patch	Fri Apr  3 10:47:16 2009
@@ -1,10 +1,10 @@
---- openttd-0.6.1/config.lib	2008-01-15 21:55:36.000000000 +0100
-+++ openttd-0.6.1/config.lib_new	2008-01-16 16:55:39.000000000 +0100
-@@ -1134,7 +1134,6 @@
- 
+--- openttd-0.7.0/config.lib~	2009-04-03 09:49:26.000000000 +0200
++++ openttd-0.7.0/config.lib	2009-04-03 09:50:32.000000000 +0200
+@@ -1333,7 +1333,6 @@
  	if [ "$with_iconv" != "0" ]; then
  		CFLAGS="$CFLAGS -DWITH_ICONV"
--		LIBS="$LIBS -liconv"
- 		if [ "$with_iconv" != "2" ]; then
- 			CFLAGS="$CFLAGS -I$with_iconv/include"
- 			LIBS="$LIBS -L$with_iconv/lib"
+ 		if [ "$link_to_iconv" = "yes" ]; then
+-			LIBS="$LIBS -liconv"
+ 			if [ "$with_iconv" != "2" ]; then
+ 				CFLAGS="$CFLAGS -I$with_iconv/include"
+ 				LIBS="$LIBS -L$with_iconv/lib"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/openttd-libiconv.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list