diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-09 16:29:37 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-09 18:04:19 +0100 |
| commit | 549146755c4a510dd3fd8db87724c3b573927d89 (patch) | |
| tree | 90d6a74f84fcc0083a2f48978687fb5a1f296fcf /Makefile.am | |
| parent | 06c962631abee5d0fc59cdabf186f9cd003a461b (diff) | |
| parent | b57de2196e111605812cc3aff4d6dcb53ec8965d (diff) | |
| download | msitools-549146755c4a510dd3fd8db87724c3b573927d89.tar.gz msitools-549146755c4a510dd3fd8db87724c3b573927d89.tar.xz msitools-549146755c4a510dd3fd8db87724c3b573927d89.zip | |
Merge remote-tracking branch 'wixl/master'
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index a76d7df..623c479 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,10 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = libmsi tests . +if WIXL +SUBDIRS += po wixl +endif + dist_include_HEADERS = \ include/libmsi.h \ include/libmsi-database.h \ @@ -33,7 +37,7 @@ DISTCLEANFILES = atconfig atlocal CLEANFILES = testsuite.log check-local: $(srcdir)/tests/testsuite atconfig atlocal - $(SHELL) $(srcdir)/tests/testsuite AUTOTEST_PATH=. $(TESTSUITEFLAGS) + $(SHELL) $(srcdir)/tests/testsuite AUTOTEST_PATH=.:wixl $(TESTSUITEFLAGS) installcheck-local: $(srcdir)/tests/testsuite atconfig atlocal $(SHELL) $(srcdir)/tests/testsuite AUTOTEST_PATH=$(bindir) $(TESTSUITEFLAGS) |