Fix @variables@ to $(variables) in Makefile.am files.
Fix the ordering of libgnu.a and LTLIBINTL on the linker
command line and added missing LTLIBINTL to tests/Makefile.am.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dc084e4..d0807ae 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,16 +15,18 @@
 	compress_prepared_bcj_x86
 
 AM_CPPFLAGS = \
-	-I@top_srcdir@/src/common \
-	-I@top_srcdir@/src/liblzma/api \
-	-I@top_builddir@/lib
+	-I$(top_srcdir)/src/common \
+	-I$(top_srcdir)/src/liblzma/api \
+	-I$(top_builddir)/lib
 
-LDADD = @top_builddir@/src/liblzma/liblzma.la
+LDADD = $(top_builddir)/src/liblzma/liblzma.la
 
 if COND_GNULIB
-LDADD += @top_builddir@/lib/libgnu.a
+LDADD += $(top_builddir)/lib/libgnu.a
 endif
 
+LDADD += $(LTLIBINTL)
+
 check_PROGRAMS = \
 	create_compress_files \
 	test_check \