Mercurial > octave-nkf

changeset 20408:3c70050faa1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix install paths of fixed and generated test files * libinterp/module.mk (libinterptestsdir): Delete redundant libinterp. * liboctave/module.mk (liboctavetestsdir): Delete redundant liboctave. * test/module.mk (TEST_INST_FILES): New variable renamed from $(nobase_fixedtests_DATA). (install-data-local, uninstall-local, install-test-files, install-test-files): New custom targets to install fixed test files to correct path.
author Mike Miller <mtmiller@octave.org>
date Wed, 22 Jul 2015 01:01:03 -0400
parents c5343519df78
children 0cefba1a1030
files libinterp/module.mk liboctave/module.mk test/module.mk
diffstat 3 files changed, 23 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/module.mk	Tue Jul 21 12:42:05 2015 -0700
+++ b/libinterp/module.mk	Wed Jul 22 01:01:03 2015 -0400
@@ -236,7 +236,7 @@
 
 LIBINTERP_TST_FILES := $(addsuffix -tst,$(LIBINTERP_TST_FILES_SRC))
 
-libinterptestsdir := $(octtestsdir)/libinterp
+libinterptestsdir := $(octtestsdir)
 
 nobase_libinterptests_DATA = $(LIBINTERP_TST_FILES)
 
--- a/liboctave/module.mk	Tue Jul 21 12:42:05 2015 -0700
+++ b/liboctave/module.mk	Wed Jul 22 01:01:03 2015 -0400
@@ -99,7 +99,7 @@
 
 LIBOCTAVE_TST_FILES := $(addsuffix -tst,$(LIBOCTAVE_TST_FILES_SRC))
 
-liboctavetestsdir := $(octtestsdir)/liboctave
+liboctavetestsdir := $(octtestsdir)
 
 nobase_liboctavetests_DATA = $(LIBOCTAVE_TST_FILES)
 
--- a/test/module.mk	Tue Jul 21 12:42:05 2015 -0700
+++ b/test/module.mk	Wed Jul 22 01:01:03 2015 -0400
@@ -89,11 +89,31 @@
 
 fixedtestsdir := $(octtestsdir)/fixed
 
-nobase_fixedtests_DATA = \
+TEST_INST_FILES = \
   test/sparse.tst \
   $(GENERATED_BC_OVERLOADS_FILES) \
   $(filter-out test/fntests.m, $(TEST_FILES))
 
+install-data-local: install-test-files
+
+uninstall-local: uninstall-test-files
+
+install-test-files:
+	for f in $(TEST_INST_FILES); do \
+	  if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \
+	  base=`echo $$f | $(SED) 's,^test/,,'`; \
+	  $(MKDIR_P) $(DESTDIR)$(fixedtestsdir)/`echo $$base | $(SED) 's,/*[^/]*$$,,'`; \
+	  $(INSTALL_DATA) $$d$$f $(DESTDIR)$(fixedtestsdir)/$$base; \
+	done
+.PHONY: install-test-files
+
+uninstall-test-files:
+	for f in $(TEST_INST_FILES); do \
+	  base=`echo $$f | $(SED) 's,^test/,,'`; \
+	  rm -f $(DESTDIR)$(fixedtestsdir)/$$base; \
+	done
+.PHONY: uninstall-test-files
+
 BUILT_SOURCES += $(GENERATED_TEST_FILES)
 
 test_EXTRA_DIST += \