Merge remote-tracking branch 'paolo/master'

7 files changed, 25 insertions, 17 deletions

diff --git a/Makefile.am b/Makefile.am
index f8dd3cc..1c44715 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,8 @@ NULL =
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = data libmsi tests po .
 
-dist_include_HEADERS = \
+libmsiincludedir = $(includedir)/libmsi-1.0
+dist_libmsiinclude_HEADERS = \
 	include/libmsi.h \
 	include/libmsi-database.h \
 	include/libmsi-query.h \
@@ -113,9 +114,20 @@ installcheck-local: $(srcdir)/tests/testsuite atconfig atlocal
 clean-local:
 	-$(SHELL) $(srcdir)/tests/testsuite --clean
 
+dist-hook:
+	@for file in `cd $(srcdir)/tests && \
+		$(AUTOM4TE) --language=autotest --trace='AT_MSIDATA:tests/data/$$1' \
+			    testsuite.at`; do \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    $(MKDIR_P) "$(distdir)$$dir" || exit 1; \
+	    echo cp -fpR $(srcdir)/$$file "$(distdir)$$dir"; \
+	    cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	done
+
+
 $(srcdir)/tests/testsuite: tests/testsuite.at tests/wixl.at tests/package.m4
 	cd $(srcdir)/tests && \
 		$(AUTOM4TE) --language=autotest -o testsuite.tmp testsuite.at && \
 		mv testsuite.tmp testsuite
 
-EXTRA_DIST = msitools.doap
+EXTRA_DIST = msitools.doap build-aux/move-if-change autogen.sh
diff --git a/configure.ac b/configure.ac
index 89cd339..d9247a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([msitools], [0.01])
+AC_INIT([msitools], [0.90])
 AC_PREREQ([2.64])
 
 AC_CONFIG_HEADERS([config.h])
@@ -57,7 +57,7 @@ AM_CONDITIONAL([WIXL], [test "x$wixl" != xno])
 GETTEXT_PACKAGE=wixl
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
 AC_SUBST(GETTEXT_PACKAGE)
-AM_GNU_GETTEXT_VERSION([1.11])
+AM_GNU_GETTEXT_VERSION([0.18])
 AM_GLIB_GNU_GETTEXT
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -76,7 +76,6 @@ AC_CONFIG_FILES([
     libmsi/Makefile
     libmsi/libmsi-1.0.pc
     tests/Makefile
-    tests/data/Makefile
 ])
 AC_OUTPUT
 
diff --git a/data/Makefile.am b/data/Makefile.am
index fe0535a..b9dceba 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-wixdir = $(datadir)/wixl-0.1/include
+wxidir = $(datadir)/wixl-$(VERSION)/include
 
-dist_wix_DATA =					\
+dist_wxi_DATA =					\
 	wixl/atk.wxi				\
 	wixl/cairo.wxi				\
 	wixl/celt051.wxi			\
diff --git a/libmsi/libmsi-1.0.pc.in b/libmsi/libmsi-1.0.pc.in
index 5f93842..abec2a4 100644
--- a/libmsi/libmsi-1.0.pc.in
+++ b/libmsi/libmsi-1.0.pc.in
@@ -8,4 +8,4 @@ Description: MSI manipulation library
 Requires: gio-2.0
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lmsi
-Cflags: -I${includedir}/
\ No newline at end of file
+Cflags: -I${includedir}/libmsi-1.0
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 830eef8..cced9d6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = data
-
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -I. \
 	      $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
 
diff --git a/tests/testsuite.at b/tests/testsuite.at
index bd3cc11..0751909 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -26,7 +26,7 @@ AT_INIT
 m4_define([AT_MSIDATA], [
 dir=`dirname $1`
 AS_MKDIR_P([$dir])
-AT_CHECK([cp $abs_srcdir/tests/data/$1 $1])])
+AT_CHECK([cp $abs_srcdir/tests/data/$1 m4_default([$2], [$1])])])
 
 # AT_DATA_UNQUOTED - define data file while allowing shell variables
 
diff --git a/tests/wixl.at b/tests/wixl.at
index f9babd9..dd64533 100644
--- a/tests/wixl.at
+++ b/tests/wixl.at
@@ -5,10 +5,7 @@ m4_define([AT_CHECK_WIXL], [
 AT_CHECK([_wixl ]$@)])
 
 # AT_WIXLDATA - copy data file from source tree
-m4_define([AT_WIXLDATA], [
-dir=`dirname $1`
-AS_MKDIR_P([$dir])
-AT_CHECK([cp $abs_srcdir/tests/data/wixl/$1 $1])])
+m4_define([AT_WIXLDATA], [AT_MSIDATA([wixl/$1], [m4_default([$2], [$1])])])
 
 
 AT_SETUP([Invalid command line])
@@ -110,15 +107,17 @@ AT_CHECK_WIXL([-o out.msi test-arp.wxs], [0], [ignore], [ignore])
 AT_CHECK([test -f out.msi], [0])
 AT_CLEANUP
 
+AT_BANNER([wixl-heat])
+
 AT_SETUP([Heat])
 mkdir -p test/a/b test/c
 touch test/a/file test/c/file
 find test > list
-AT_CHECK([cat list | _wixl_heat -p test/ | grep File], [0],
+AT_CHECK([cat list | _wixl_heat -p test/ | grep File | sort], [0],
 [          <File Id="fil1C4ED87DDF872C3D730CE70E5F0B56D2" KeyPath="yes" Source="SourceDir/a/file"/>
           <File Id="filA95C2C271801F96CC9C5D672A7E6CC66" KeyPath="yes" Source="SourceDir/c/file"/>
 ], [ignore])
-AT_CHECK([cat list | _wixl_heat -p test/ -x c | grep File], [0],
+AT_CHECK([cat list | _wixl_heat -p test/ -x c | grep File | sort], [0],
 [          <File Id="fil1C4ED87DDF872C3D730CE70E5F0B56D2" KeyPath="yes" Source="SourceDir/a/file"/>
 ], [ignore])
 AT_CLEANUP