Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/games
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10538
Modified Files:
xmahjongg.info xmahjongg.patch
Log Message:
fix data-dir
Index: xmahjongg.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/games/xmahjongg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmahjongg.patch 2 Jul 2013 21:06:05 -0000 1.2
+++ xmahjongg.patch 8 Sep 2013 02:26:59 -0000 1.3
@@ -1,6 +1,6 @@
diff -Nurd -x'*~' xmahjongg-3.7.orig/configure.in xmahjongg-3.7/configure.in
---- xmahjongg-3.7.orig/configure.in 2013-07-02 16:22:46.000000000 -0400
-+++ xmahjongg-3.7/configure.in 2013-07-02 16:23:05.000000000 -0400
+--- xmahjongg-3.7.orig/configure.in 2004-07-19 11:23:08.000000000 -0400
++++ xmahjongg-3.7/configure.in 2013-09-07 22:21:01.000000000 -0400
@@ -1,6 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/game.hh)
@@ -11,6 +11,18 @@
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
+@@ -108,10 +109,7 @@
+ dnl Set PKGDATADIR -- must expand it to get rid of a possible `${prefix}'
+ dnl
+
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-pkgdatadir=$datadir/$PACKAGE
+-eval pkgdatadir=$pkgdatadir
+-AC_DEFINE_UNQUOTED(PKGDATADIR, "$pkgdatadir", [Define to the pathname of the
--pkgdatadir directory.])
++dnl pkgdatadir is a standard automake variable
+
+
+ dnl
diff -Nurd -x'*~' xmahjongg-3.7.orig/liblcdf/Makefile.am
xmahjongg-3.7/liblcdf/Makefile.am
--- xmahjongg-3.7.orig/liblcdf/Makefile.am 2013-07-02 16:22:46.000000000
-0400
+++ xmahjongg-3.7/liblcdf/Makefile.am 2013-07-02 16:35:25.000000000 -0400
@@ -21,14 +33,14 @@
-INCLUDES = $(X_CFLAGS) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
diff -Nurd -x'*~' xmahjongg-3.7.orig/src/Makefile.am
xmahjongg-3.7/src/Makefile.am
---- xmahjongg-3.7.orig/src/Makefile.am 2013-07-02 16:22:46.000000000 -0400
-+++ xmahjongg-3.7/src/Makefile.am 2013-07-02 16:35:49.000000000 -0400
+--- xmahjongg-3.7.orig/src/Makefile.am 2004-07-19 11:23:08.000000000 -0400
++++ xmahjongg-3.7/src/Makefile.am 2013-09-07 22:22:44.000000000 -0400
@@ -30,7 +30,7 @@
BUILT_SOURCES = images.c
-INCLUDES = $(X_CFLAGS) -I$(top_srcdir)/include
-+AM_CPPFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
++AM_CPPFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
-DPKGDATADIR=\"$(pkgdatadir)\"
xmahjongg_LDADD = $(LDADD) ../liblcdf/liblcdf.a @X_LIBS@ @X_PRE_LIBS@ -lX11
@X_EXTRA_LIBS@
Index: xmahjongg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/games/xmahjongg.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xmahjongg.info 2 Jul 2013 21:06:05 -0000 1.3
+++ xmahjongg.info 8 Sep 2013 02:26:59 -0000 1.4
@@ -1,6 +1,6 @@
Package: xmahjongg
Version: 3.7
-Revision: 3
+Revision: 4
Maintainer: None <fink-de...@lists.sourceforge.net>
BuildDepends: <<
autoconf2.6,
@@ -13,7 +13,7 @@
Source: http://www.lcdf.org/%n/%n-%v.tar.gz
Source-MD5: 9db5bf1b329b410220b7976cd9b3d374
PatchFile: %n.patch
-PatchFile-MD5: 1abe8bde03dc300116b0327a915e4e98
+PatchFile-MD5: 7c3d56a6c7ec67292e325027216f3a6d
CompileScript: <<
mv configure.in configure.ac
autoreconf -fi
@@ -39,6 +39,9 @@
Goofy -I ordering, but doesn't use any fink headers so not bothering
to fix (fink-package-precedence protects against it anyway) -- dmacks
+
+pkgdatadir `eval` expansion not working for ${prefix}, but just
+overriding a default with its default value anyway.
<<
Homepage: http://www.lcdf.org/xmahjongg/
License: GPL
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
