From 62f78cac741c4ba86d325a88768c2f4ce2268086 Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 14 Sep 2004 12:14:07 +0000
Subject: [PATCH] get install version from makefile, minor log improvement

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@136 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-ical/iCalSaxDriver/ChangeLog       |  4 ++++
 sope-ical/iCalSaxDriver/GNUmakefile     |  4 +++-
 sope-ical/iCalSaxDriver/ICalSaxParser.m | 14 +++++++-------
 sope-ical/iCalSaxDriver/Version         |  4 ++--
 sope-ical/iCalSaxDriver/fhs.make        |  2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/sope-ical/iCalSaxDriver/ChangeLog b/sope-ical/iCalSaxDriver/ChangeLog
index c5ced8f8..451615e5 100644
--- a/sope-ical/iCalSaxDriver/ChangeLog
+++ b/sope-ical/iCalSaxDriver/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-14  Helge Hess  <helge.hess@skyrix.com>
+
+	* ICalSaxParser.m: minor improvement to logging (v4.3.15)
+
 2004-09-11  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* GNUmakefile.preamble: minor changes for inline compilation with
diff --git a/sope-ical/iCalSaxDriver/GNUmakefile b/sope-ical/iCalSaxDriver/GNUmakefile
index cab03a0f..bbd92cda 100644
--- a/sope-ical/iCalSaxDriver/GNUmakefile
+++ b/sope-ical/iCalSaxDriver/GNUmakefile
@@ -1,10 +1,12 @@
 # $Id$
 
 include $(GNUSTEP_MAKEFILES)/common.make
+-include ../../Version
+-include ./Version
 
 BUNDLE_NAME        = iCalSaxDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
 
 iCalSaxDriver_OBJC_FILES = \
 	ICalSaxParser.m		\
diff --git a/sope-ical/iCalSaxDriver/ICalSaxParser.m b/sope-ical/iCalSaxDriver/ICalSaxParser.m
index 6e24134d..c11cf7e0 100644
--- a/sope-ical/iCalSaxDriver/ICalSaxParser.m
+++ b/sope-ical/iCalSaxDriver/ICalSaxParser.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "ICalSaxParser.h"
 #include "NSString+ICal.h"
@@ -67,21 +66,22 @@ static Class StrClass = Nil;
 /* logging of unknown elements etc */
 
 - (void)logUnknownComponentKind:(icalcomponent *)_comp {
-  NSLog(@"%s: cannot process component kind %s",
+  NSLog(@"%s: cannot process component kind: '%s'",
         __PRETTY_FUNCTION__,
-        icalenum_component_kind_to_string(icalcomponent_isa(_comp)));
+        _comp
+        ?icalenum_component_kind_to_string(icalcomponent_isa(_comp)):"null");
 }
 
 - (void)logUnknownPropertyKind:(icalproperty *)_p {
-  NSLog(@"%s: cannot process property kind %s",
+  NSLog(@"%s: cannot process property kind: '%s'",
         __PRETTY_FUNCTION__,
-        icalenum_property_kind_to_string(icalproperty_isa(_p)));
+        _p ? icalenum_property_kind_to_string(icalproperty_isa(_p)) : "null");
 }
 
 - (void)logUnknownParameterKind:(icalparameter *)_pa {
-  NSLog(@"%s: cannot process parameter kind %s",
+  NSLog(@"%s: cannot process parameter kind: '%s'",
         __PRETTY_FUNCTION__,
-        icalparameter_kind_to_string(icalparameter_isa(_pa)));
+        _pa ? icalparameter_kind_to_string(icalparameter_isa(_pa)): "null");
 }
 
 /* walking */
diff --git a/sope-ical/iCalSaxDriver/Version b/sope-ical/iCalSaxDriver/Version
index cc039aca..c2d51c16 100644
--- a/sope-ical/iCalSaxDriver/Version
+++ b/sope-ical/iCalSaxDriver/Version
@@ -1,3 +1,3 @@
-# $Id$
+# version
 
-SUBMINOR_VERSION:=14
+SUBMINOR_VERSION:=15
diff --git a/sope-ical/iCalSaxDriver/fhs.make b/sope-ical/iCalSaxDriver/fhs.make
index ebaa53ae..56604151 100644
--- a/sope-ical/iCalSaxDriver/fhs.make
+++ b/sope-ical/iCalSaxDriver/fhs.make
@@ -5,7 +5,7 @@
 ifneq ($(FHS_INSTALL_ROOT),)
 
 FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
-FHS_SAX_DIR=$(FHS_LIB_DIR)sope-4.3/saxdrivers/
+FHS_SAX_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/saxdrivers/
 
 fhs-sax-dirs ::
 	$(MKDIRS) $(FHS_SAX_DIR)
-- 
2.39.5