From: Martin Mares <mj@ucw.cz>
Date: Sat, 25 Aug 2007 10:08:53 +0000 (+0200)
Subject: Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git
X-Git-Tag: holmes-import~506^2~13^2~91
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=e6f42d16d3278e709f23825944598769539368e5;p=libucw.git

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

Hand-merged:

  debug/Makefile
  lib/Makefile
  gather/shepherd/shep-select.c
---

e6f42d16d3278e709f23825944598769539368e5
diff --cc lib/Makefile
index 37a1e7fc,025d088b..814ec251
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -1,7 -1,7 +1,7 @@@
 -# Makefile for the UCW Library (c) 1997--2006 Martin Mares <mj@ucw.cz>
 +# Makefile for the UCW Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
  
  DIRS+=lib
- LIBUCW=$(o)/lib/libucw.$(LS)
+ CONFIGS+=library
  
  ifdef CONFIG_UCW_DBTOOL
  PROGS+=$(o)/lib/db-tool