Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git#v3.12

[libucw.git] / build / Makebottom

diff --git a/build/Makebottom b/build/Makebottom
index 3475df019c75ce72aa34cf4840c6228d959548d8..a474614bb2817c9f93e6310c22b347d443a83269 100644 (file)
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -120,13 +120,13 @@ $(o)/%-tt.o: $(s)/%.c $(o)/autoconf.h
 
 # Rules for testing
 
-$(o)/%-t: $(o)/%-tt.o $(LIBSH)
+$(o)/%-t: $(o)/%-tt.o $(TESTING_DEPS)
        $(M)LD-TEST $@
-       $(Q)$(CC) $(LDFLAGS) -o $@ $^ $(shell $(s)/build/lib-flags $^) $(LIBS)
+       $(Q)$(CC) $(LDFLAGS) -o $@ $(shell $(s)/build/lib-flags $^) $(LIBS)
 
 $(o)/%.test: $(s)/%.t $(s)/build/tester
        $(M)TEST $@
-       $(Q)$(s)/build/tester $< && touch $@
+       $(Q)$(s)/build/tester --rundir=run $(TESTERFLAGS) $< && touch $@
 
 # Rules for binaries
 
@@ -161,15 +161,17 @@ $(o)/%: %.pl $(o)/config.mk $(s)/build/genconf
        $(Q)chmod +x $@
        $(Q)$(call symlink,$@,run/$(BINDIR))
 
+PERL_MODULE_DIR=UCW
+
 $(o)/%.pm: $(s)/%.pm
-       $(M)PM $<
+       $(M)"PM $< -> run/lib/perl5/$(PERL_MODULE_DIR)/$(@F)"
        $(Q)cp $^ $@
-       $(Q)$(call symlink,$@,run/lib/perl5/Sherlock)
+       $(Q)$(call symlink,$@,run/lib/perl5/$(PERL_MODULE_DIR))
 
 $(o)/%.pm: %.pm
-       $(M)PM $<
+       $(M)"PM $< -> run/lib/perl/$(PERL_MODULE_DIR)/$(@F)"
        $(Q)cp $^ $@
-       $(Q)$(call symlink,$@,run/lib/perl5/Sherlock)
+       $(Q)$(call symlink,$@,run/lib/perl5/$(PERL_MODULE_DIR))
 
 # Rules for data files