Browse Source

data: Move architecture tables to a new data directory

Guillem Jover 4 years ago
parent
commit
97309bef8b
8 changed files with 8 additions and 8 deletions
  1. 5 5
      Makefile.am
  2. 0 0
      data/abitable
  3. 0 0
      data/cputable
  4. 0 0
      data/ostable
  5. 0 0
      data/triplettable
  6. 1 1
      run-script
  7. 1 1
      scripts/Makefile.am
  8. 1 1
      utils/Makefile.am

+ 5 - 5
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

abitable → data/abitable


cputable → data/cputable


ostable → data/ostable


triplettable → data/triplettable


+ 1 - 1
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

+ 1 - 1
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)
 

+ 1 - 1
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 = \