diff --git a/test/Makefile.in b/test/Makefile.in index ae0565072..4473a2fca 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -25,6 +25,18 @@ abs_builddir = @abs_builddir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +# Shell quote; +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) + +T = $(wildcard $(srcdir)/t-*.sh) + +ifeq ("@APPLIB@", "yes") +T += $(srcdir)/lvm2app.sh +all: api/vgtest +api/vgtest: + $(MAKE) -C api vgtest +endif + all: init.sh ./bin/harness t-*.sh @@ -46,21 +58,9 @@ init.sh: $(srcdir)/Makefile.in $(srcdir)/test-utils.sh .bin-dir-stamp bin/not bi echo 'export PATH' >> $@-t chmod a-w $@-t mv $@-t $@ - -cp $(srcdir)/test-utils.sh . - -cp $(srcdir)/test-lib.sh . - -cp $(T) . - -# Shell quote; -SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) - -T = $(wildcard $(srcdir)/t-*.sh) - -ifeq ("@APPLIB@", "yes") -T += lvm2app.sh -all: api/vgtest -api/vgtest: - $(MAKE) -C api vgtest -endif + test "$(srcdir)" != "." && cp $(srcdir)/test-utils.sh \ + $(srcdir)/test-lib.sh \ + $(T) . Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@