From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Wed, 25 Jul 2007 11:06:58 +0000 (+0200)
Subject: Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git
X-Git-Tag: holmes-import~506^2~13^2~92
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=d18403664f23ca1464d659b29912758d72b2abec;p=libucw.git

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

d18403664f23ca1464d659b29912758d72b2abec
diff --cc lib/perl/Filelock/Makefile
index 873f09a6,86b76604..de94cc0f
--- a/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 65dc6623,4a44261e..8fc355bb
--- a/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