diff options
| author | Guillem Jover <guillem@debian.org> | 2016-08-10 23:52:03 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2016-10-30 04:43:28 +0100 |
| commit | 97309bef8b664c2d58cb689a3e82848021ae9bad (patch) | |
| tree | 54289445f7714033a595343d24c59517ce8253a1 | |
| parent | 7fd94771c8340fecef49d90577de4d49adcfe323 (diff) | |
| download | dpkg-97309bef8b664c2d58cb689a3e82848021ae9bad.tar.gz | |
data: Move architecture tables to a new data directory
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | data/abitable (renamed from abitable) | 0 | ||||
| -rw-r--r-- | data/cputable (renamed from cputable) | 0 | ||||
| -rw-r--r-- | data/ostable (renamed from ostable) | 0 | ||||
| -rw-r--r-- | data/triplettable (renamed from triplettable) | 0 | ||||
| -rwxr-xr-x | run-script | 2 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/Makefile.am | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 7545120fd..0306eaf2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,10 +19,10 @@ ACLOCAL_AMFLAGS = -I m4 dist_pkgdata_DATA = \ - cputable \ - ostable \ - abitable \ - triplettable + data/cputable \ + data/ostable \ + data/abitable \ + data/triplettable EXTRA_DIST = \ .mailmap \ @@ -161,7 +161,7 @@ test_data = \ # We need to use absolute paths here due to strict.t invoking a sub-perl, # while changing dir to source dir on out-of-tree builds. TEST_ENV_VARS = \ - DPKG_DATADIR=$(abs_top_srcdir) \ + DPKG_DATADIR=$(abs_top_srcdir)/data \ $(nil) include $(top_srcdir)/check.am diff --git a/abitable b/data/abitable index 0631a8ca7..0631a8ca7 100644 --- a/abitable +++ b/data/abitable diff --git a/cputable b/data/cputable index e2f3f2d19..e2f3f2d19 100644 --- a/cputable +++ b/data/cputable diff --git a/triplettable b/data/triplettable index abe47261b..abe47261b 100644 --- a/triplettable +++ b/data/triplettable diff --git a/run-script b/run-script index 45ee7ef0e..dbc5dcc06 100755 --- a/run-script +++ b/run-script @@ -11,7 +11,7 @@ cd "$OLDPWD" # Set up the environment, to use local perl modules and data files. export PERL="${PERL:-perl}" export PERL5LIB="$cwd/scripts:$cwd/dselect/methods" -export DPKG_DATADIR="$cwd" +export DPKG_DATADIR="$cwd/data" script="$1" shift 1 diff --git a/scripts/Makefile.am b/scripts/Makefile.am index cf068d9cd..e8f982a9c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -187,7 +187,7 @@ coverage-clean: rm -rf cover_db TEST_ENV_VARS = \ - DPKG_DATADIR=$(srcdir)/.. \ + DPKG_DATADIR=$(top_srcdir)/data \ DPKG_ORIGINS_DIR=$(srcdir)/t/origins TEST_COVERAGE = $(PERL_COVERAGE) diff --git a/utils/Makefile.am b/utils/Makefile.am index 83378ad78..ed67e94c9 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -59,7 +59,7 @@ endif uninstall-local: rm -f $(DESTDIR)$(sysconfdir)/alternatives/README -TEST_ENV_VARS = DPKG_DATADIR=$(top_srcdir) +TEST_ENV_VARS = DPKG_DATADIR=$(top_srcdir)/data test_tmpdir = t.tmp test_scripts = \ |