diff -Nurd -x'*~' xmahjongg-3.7.orig/configure.in xmahjongg-3.7/configure.in
--- 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)
-AM_INIT_AUTOMAKE(xmahjongg, 3.7)
+AC_INIT([xmahjongg], [3.7])
+AC_CONFIG_SRCDIR([src/game.hh])
+AM_INIT_AUTOMAKE
 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
@@ -18,4 +18,4 @@
 ## liblcdf_a_DEPENDENCIES = @FIXLIBC_O@
 ## liblcdf_a_LIBADD = @FIXLIBC_O@
 
-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	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) -DPKGDATADIR=\"$(pkgdatadir)\"
 
 xmahjongg_LDADD = $(LDADD) ../liblcdf/liblcdf.a @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@