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

diff --cc lib/perl/Filelock/Makefile
index 873f09a6ef2fbff1676f256d0bec7f6ee548d429,86b76604ad0911ce41a7d74ae319c99599307d18..de94cc0f5592912b12b48a51a64143be69882e44
--- 1/lib/perl/Filelock/Makefile
--- 2/lib/perl/Filelock/Makefile
+++ b/lib/perl/Filelock/Makefile
@@@ -5,12 -5,11 +5,12 @@@ FILELOCK_DIR=lib/perl/Fileloc
  
  PROGS+=$(o)/lib/perl/Filelock/Filelock.pm
  
- extras:: $(o)/lib/perl/Filelock/arch/auto/Sherlock/Filelock/Filelock.$(SOEXT)
+ extras:: $(o)/lib/perl/Filelock/arch/auto/UCW/Filelock/Filelock.$(SOEXT)
  
- $(o)/lib/perl/Filelock/arch/auto/Sherlock/Filelock/Filelock.$(SOEXT): $(o)/$(FILELOCK_DIR)/Filelock.xs $(o)/$(FILELOCK_DIR)/Filelock.pm $(o)/$(FILELOCK_DIR)/Makefile
+ $(o)/lib/perl/Filelock/arch/auto/UCW/Filelock/Filelock.$(SOEXT): $(o)/$(FILELOCK_DIR)/Filelock.xs $(o)/$(FILELOCK_DIR)/Filelock.pm $(o)/$(FILELOCK_DIR)/Makefile
        $(M)MAKE $@
        $(Q)cd $(o)/$(FILELOCK_DIR) && $(MAKE) -f Makefile $(MAKESILENT)
 +      $(Q)touch $@
        $(Q)cp $@ run/$(DATADIR)/
  
  $(o)/$(FILELOCK_DIR)/Makefile: $(o)/$(FILELOCK_DIR)/Makefile.PL

diff --cc lib/perl/Ulimit/Makefile
index 65dc66235b5096622ec4cf91ba2d9659b8df3820,4a44261eb4e075e21755fdd87a4d09f4e2949e39..8fc355bb6e08a97c390040e2e309dd68234c9c97
--- 1/lib/perl/Ulimit/Makefile
--- 2/lib/perl/Ulimit/Makefile
+++ b/lib/perl/Ulimit/Makefile
@@@ -5,12 -5,11 +5,12 @@@ ULIMIT_DIR=lib/perl/Ulimi
  
  PROGS+=$(o)/lib/perl/Ulimit/Ulimit.pm
  
- extras:: $(o)/lib/perl/Ulimit/arch/auto/Sherlock/Ulimit/Ulimit.$(SOEXT)
+ extras:: $(o)/lib/perl/Ulimit/arch/auto/UCW/Ulimit/Ulimit.$(SOEXT)
  
- $(o)/lib/perl/Ulimit/arch/auto/Sherlock/Ulimit/Ulimit.$(SOEXT): $(o)/$(ULIMIT_DIR)/Ulimit.xs $(o)/$(ULIMIT_DIR)/Ulimit.pm $(o)/$(ULIMIT_DIR)/Makefile
+ $(o)/lib/perl/Ulimit/arch/auto/UCW/Ulimit/Ulimit.$(SOEXT): $(o)/$(ULIMIT_DIR)/Ulimit.xs $(o)/$(ULIMIT_DIR)/Ulimit.pm $(o)/$(ULIMIT_DIR)/Makefile
        $(M)MAKE $@
        $(Q)cd $(o)/$(ULIMIT_DIR) && $(MAKE) -f Makefile $(MAKESILENT)
 +      $(Q)touch $@
        $(Q)cp $@ run/$(DATADIR)/
  
  $(o)/$(ULIMIT_DIR)/Makefile: $(o)/$(ULIMIT_DIR)/Makefile.PL