Partially fix "make distcheck".

It is helpful to build a distribution package to run tests on other
machines, which may not have full development toolsets available.

This packages things up so at least the compilation part of distcheck
succeeds.

diff --git a/Makefile.am b/Makefile.am
index 20116257eabdff9216eabf8aba4f11057458f884..63f102374ce1138d6a13ab54c5a08cf89c1309cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,12 @@ ACLOCAL_AMFLAGS = -I m4
 
 AM_CPPFLAGS = -I$(top_srcdir)/src $(STUB_INCLUDES)
 
+EXTRA_DIST = scripts/fix-gnulib.pl scripts/fix-ltdl.pl \
+             scripts/gen-options.awk scripts/gen-strtab.awk \
+             scripts/gen-tree.awk scripts/join.awk scripts/pe-subsys.awk \
+             src/copysym.h src/help.h src/pack.h src/tap.h t/getopt/getopt.h \
+             t/nls/gettext.h t/nls/mbswidth.h tests/data/gnulib.mk
+
 check_LIBRARIES = t/libdummy.a t/libempty.a
 
 check_PROGRAMS = t/packtestu t/packtests t/packtestu64 t/packtests64
@@ -54,7 +60,6 @@ libnlscopysym_a_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_NLS
 libnlscopysym_a_SHORTNAME = nls
 
 DISTCLEANFILES =
-EXTRA_DIST =
 SUFFIXES =
 
 include $(top_srcdir)/snippet/autotest.mk

diff --git a/tests/scripts.at b/tests/scripts.at
index 932a0621915acefd39c39ce5510cc0d88605bb64..c38faba07caf02cc03fa5836ec85d39e92ef2297 100644 (file)
--- a/tests/scripts.at
+++ b/tests/scripts.at
@@ -37,7 +37,7 @@ do stuff with ARG
 --flagval
 ]])
 
-AT_CHECK([$AWK -f "$builddir/scripts/gen-options.awk" <options.def >options.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-options.awk" <options.def >options.h])
 
 AT_DATA([context.h],
 [[struct option { const char *name; int has_arg; int *flag; int val; };
@@ -268,7 +268,7 @@ int main(void)
 AT_DATA([single.dat],
 [[--single-option
 ]])
-AT_CHECK([$AWK -f "$builddir/scripts/gen-options.awk" <single.dat >options.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-options.awk" <single.dat >options.h])
 AT_CHECK([$CC -o single$EXEEXT test.c && ./single$EXEEXT], [0],
 [[0
 --single-option, 0, 0
@@ -280,7 +280,7 @@ AT_DATA([16bit.dat],
 -c, --the-third-option[=ARG]
 -d, --the-fourth-option
 ]])
-AT_CHECK([$AWK -f "$builddir/scripts/gen-options.awk" <16bit.dat >options.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-options.awk" <16bit.dat >options.h])
 AT_CHECK([$CC -o 16bit$EXEEXT test.c && ./16bit$EXEEXT], [0],
 [[2
 --the-first-option, 0, 'a'
@@ -317,7 +317,7 @@ newline\
 # with a comment
 ]])
 
-AT_CHECK([$AWK -f "$builddir/scripts/gen-strtab.awk" <test.def >test.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-strtab.awk" <test.def >test.h])
 
 sed -n 's/^[[&]]\([[^ ]]*\).*/\1/p' test.def >identifiers
 
@@ -379,13 +379,13 @@ AT_KEYWORDS([gen-strtab awk script scripts])
 AT_DATA([test0.def],
 [[&hello hello
 ]])
-AT_CHECK([$AWK -f "$builddir/scripts/gen-strtab.awk" <test0.def >test0.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-strtab.awk" <test0.def >test0.h])
 
 AT_DATA([test1.def],
 [[@nozero
 &hello hello
 ]])
-AT_CHECK([$AWK -f "$builddir/scripts/gen-strtab.awk" <test1.def >test1.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-strtab.awk" <test1.def >test1.h])
 
 AT_DATA([test.c],
 [[#include <stdio.h>
@@ -410,7 +410,7 @@ AT_DATA([test0.def],
 &bar bar
 &baz baz
 ]])
-AT_CHECK([$AWK -f "$builddir/scripts/gen-strtab.awk" <test0.def >test0.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-strtab.awk" <test0.def >test0.h])
 
 AT_DATA([test0.c],
 [[#include <stdio.h>
@@ -445,7 +445,7 @@ AT_DATA([test0.def],
 &b world
 &c goodbye
 ]])
-AT_CHECK([$AWK -f "$builddir/scripts/gen-strtab.awk" <test0.def >test0.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-strtab.awk" <test0.def >test0.h])
 AT_CHECK([sed -n -f l10n.sed test0.h | LC_ALL=C sort], [0],
 [["goodbye"
 "hello world"
@@ -457,7 +457,7 @@ AT_DATA([test1.def],
 &&b world
 &&c goodbye
 ]])
-AT_CHECK([$AWK -f "$builddir/scripts/gen-strtab.awk" <test1.def >test1.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-strtab.awk" <test1.def >test1.h])
 AT_CHECK([sed -n -f l10n.sed test1.h], [0],
 [["hello world"
 ]])
@@ -512,7 +512,7 @@ ROOT1
 # comment
 ]])
 
-AT_CHECK([$AWK -f "$builddir/scripts/gen-tree.awk" <tree.def >tree.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-tree.awk" <tree.def >tree.h])
 
 AT_DATA([test0.c],
 [[#include "tree.h"
@@ -570,7 +570,7 @@ ROOT
   e 1
   f 2
 ]])
-AT_CHECK([$AWK -f "$builddir/scripts/gen-tree.awk" <tree.def >tree.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-tree.awk" <tree.def >tree.h])
 
 AT_DATA([test0.c],
 [[float tree_strtab = 0;
@@ -613,7 +613,7 @@ AT_DATA([flat.def],
  c 3
 @nostrtab
 ]])
-AT_CHECK([$AWK -f "$builddir/scripts/gen-tree.awk" <flat.def >flat.h])
+AT_CHECK([$AWK -f "$srcdir/scripts/gen-tree.awk" <flat.def >flat.h])
 
 sed -e 's/tree\.h/flat.h/' -e 's/ROOT/FLAT/' test0.c >test1.c
 AT_CHECK([$CC -o test1$EXEEXT test1.c && ./test1$EXEEXT], [0],
@@ -628,7 +628,7 @@ AT_CLEANUP
 AT_SETUP([join.awk])
 AT_KEYWORDS([join awk script scripts])
 
-JOIN="$AWK -f $builddir/scripts/join.awk --"
+JOIN="$AWK -f $srcdir/scripts/join.awk --"
 
 AT_DATA([a],
 [[1 a