Get rid of SHERLOCK_VERSION and use UCW_VERSION everywhere

diff --git a/charset/libcharset.pc b/charset/libcharset.pc
index 6d14cbe419f278fb0917ff8fa71eac2528e31dad..19e7402134e3251d2f6d83250e7aae3f783c2ea4 100644 (file)
--- a/charset/libcharset.pc
+++ b/charset/libcharset.pc
@@ -5,7 +5,7 @@ incdir=.
 
 Name: libcharset
 Description: Character set conversion library
-Version: @SHERLOCK_VERSION@
+Version: @UCW_VERSION@
 Cflags: -I${incdir}
 Libs: -L${libdir} -lcharset
 Requires: @DEPS@

diff --git a/images/libimages.pc b/images/libimages.pc
index 3bf4c2e3dab8ce14ace77014f0f68a51fc7716e1..10f6e4f100118dba9d0546960e70e2c3b78f6e32 100644 (file)
--- a/images/libimages.pc
+++ b/images/libimages.pc
@@ -5,7 +5,7 @@ incdir=.
 
 Name: libimages
 Description: Sherlock image library
-Version: @SHERLOCK_VERSION@
+Version: @UCW_VERSION@
 Cflags: -I${incdir}
 Libs: -L${libdir} -limages -lm -lpthread @LIBIMAGES_LIBS@
 Requires: @DEPS@

diff --git a/shxml/libshxml.pc b/shxml/libshxml.pc
index c2172b399fdc1d2815372d0144be4e164a2579c8..877b7a436f61f04268e22bef18e909f7d4ca5be7 100644 (file)
--- a/shxml/libshxml.pc
+++ b/shxml/libshxml.pc
@@ -5,7 +5,7 @@ incdir=.
 
 Name: libshxml
 Description: XML parser for Sherlock project
-Version: @SHERLOCK_VERSION@
+Version: @UCW_VERSION@
 Cflags: -I${incdir}
 Libs: -L${libdir} -lshxml
 Requires: @DEPS@

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 705421dae828da7a1956babb5d96c5bc53e098d4..938f8f407251efccbc468103e95f62fba8a83cb6 100644 (file)
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -2,10 +2,8 @@
 # (c) 2005--2009 Martin Mares <mj@ucw.cz>
 
 # Version of the whole package
-Set("SHERLOCK_VERSION" => "4.0.1-dev");
-Set("SHERLOCK_VERSION_CODE" => 4000000);
-Set("UCW_VERSION" => Get("SHERLOCK_VERSION"));
-Set("UCW_VERSION_CODE" => Get("SHERLOCK_VERSION_CODE"));
+Set("UCW_VERSION" => "4.0.1-dev");
+Set("UCW_VERSION_CODE" => 4000001);
 
 # Compile everything with debug information and ASSERT's
 UnSet("CONFIG_DEBUG");

diff --git a/ucw/libucw.pc b/ucw/libucw.pc
index 5e6801fa7869b47aef8f613c74062bab5403c432..c4784eb297e12d0c8337dffced4541c441597e93 100644 (file)
--- a/ucw/libucw.pc
+++ b/ucw/libucw.pc
@@ -21,6 +21,6 @@ build_system=@INSTALL_SHARE_DIR@/ucw/build
 
 Name: libucw
 Description: A library of utility functions and data structures
-Version: @SHERLOCK_VERSION@
+Version: @UCW_VERSION@
 Cflags: -I${incdir}
 Libs: -L${libdir} -lucw ${threads} ${regex}