use Version file for install locations

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@341 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/INSTALL b/INSTALL
index 887a2c84c635df778eedec2e879f3e04b18df2fc..322d996899829a9a92a1bbb347aa7125c0cdbac0 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -58,7 +58,7 @@ sope-gdl1
 Building
 ========
 
-If the prerequisites are properly fulfilled, building SOPE 4.3 is
+If the prerequisites are properly fulfilled, building SOPE 4.5 is
 a simple:
 
   ./configure --enable-debug

diff --git a/README b/README
index ec5c18f24bc0a966a9986054ebc4084548dc1e97..0ca6ac799f7cedd6fb7417f95f33d04326285416 100644 (file)
--- a/README
+++ b/README
@@ -1,12 +1,10 @@
-// TODO: update for new SOPE 3.3 structure
-
 SKYRiX Object Publishing Environment
 ====================================
 
 This directory contains SOPE, the application server hosting the
 OpenGroupware.org business logic and web interface.
 
-SOPE 4.3 is the development version of the upcoming SOPE 4.4 release.
+SOPE 4.5 is the development version of the upcoming SOPE 4.6 release.
 
 SKYRiX Libraries for XML Processing (sope-xml)
 ==============================================

diff --git a/TODO-4.3.txt b/TODO-4.3.txt
deleted file mode 100644 (file)
index c83bfdc..0000000
--- a/TODO-4.3.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-TODOs for SOPE 4.3
-==================
-
-- rename DOM classes to be compatible with some upcoming WebKit (major change)
-  - can we keep the DOM protocols?
-
-- do something about
-  - WEExtensions.bundle
-  - WOExtensions.bundle
-  which contains WOxElemBuilders and install in Library/Bundles
-
-- fix bundle pathes, eg:
-  Library/SaxDrivers => Library/SaxDrivers/4.3

diff --git a/TODO.txt b/TODO.txt
new file mode 100644 (file)
index 0000000..9cabfca
--- /dev/null
+++ b/TODO.txt
@@ -0,0 +1,5 @@
+TODOs for SOPE 4.5
+==================
+
+- rename DOM classes to be compatible with some upcoming WebKit (major change)
+  - can we keep the DOM protocols?

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 7a8f6dcd8a9ec0a996b6d3c24ad6a482cba48df2..f49b2a61cb12ef3c57f5c2cddb6a02158e94fefb 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-04  Helge Hess  <helge.hess@skyrix.com>
+
+       * use Version file for install directory location
+
 2004-11-03  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * DynamicElements/*.api: provided formal specifications for all

diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile
index f7a123f02cb57081ed791a5a157477e71c20cd93..ca13c991b5dcc45de1352ba6e4dcb0c10e3d2f58 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile
+++ b/sope-appserver/NGObjWeb/GNUmakefile
@@ -135,7 +135,7 @@ endif
 
 BUNDLE_NAME      = SoCore
 BUNDLE_EXTENSION = .sxp
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
 
 SoCore_OBJC_FILES      = SoCoreProduct.m
 SoCore_RESOURCE_FILES  = SoObjects/product.plist Version

diff --git a/sope-appserver/NGObjWeb/fhs.make b/sope-appserver/NGObjWeb/fhs.make
index aa5056d5400a8ea2180020765a91e6056abcb08c..7109fc8de953529cb9e3ebea0acb8f349928aa16 100644 (file)
--- a/sope-appserver/NGObjWeb/fhs.make
+++ b/sope-appserver/NGObjWeb/fhs.make
@@ -7,7 +7,7 @@ ifneq ($(FHS_INSTALL_ROOT),)
 FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
 FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
 FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
-FHS_SO_DIR=$(FHS_LIB_DIR)sope-4.3/products/
+FHS_SO_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/products/
 
 NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
 NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"

diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog
index 1580d7a3432ee23d639cd22838cc73c1a568ca0a..0d6bb9baeba0e229ec482e9293950c1d8b5c37d4 100644 (file)
--- a/sope-appserver/SoOFS/ChangeLog
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-04  Helge Hess  <helge.hess@skyrix.com>
+
+       * use Version file for install directory location
+
 2004-10-12  Helge Hess  <helge.hess@opengroupware.org>
 
        * sope.m: minor logging improvements (v4.3.12)

diff --git a/sope-appserver/SoOFS/GNUmakefile b/sope-appserver/SoOFS/GNUmakefile
index a581b9a3ec028c246bbd91aba9dd65dc9c6f5ada..54b720b82f389d18505aba4f18d6431b5200b5d0 100644 (file)
--- a/sope-appserver/SoOFS/GNUmakefile
+++ b/sope-appserver/SoOFS/GNUmakefile
@@ -56,7 +56,7 @@ libSoOFS_OBJC_FILES = \
 
 BUNDLE_NAME      = SoOFS
 BUNDLE_EXTENSION = .sxp
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
 
 SoOFS_OBJC_FILES       = SoOFSProduct.m
 SoOFS_RESOURCE_FILES   = product.plist Version

diff --git a/sope-appserver/SoOFS/fhs.make b/sope-appserver/SoOFS/fhs.make
index e260862c6984c43e504d707e43dbfb63fdb6289f..c28f854e56faee5fafbfaa3b1dbc634f4d69ec06 100644 (file)
--- a/sope-appserver/SoOFS/fhs.make
+++ b/sope-appserver/SoOFS/fhs.make
@@ -8,7 +8,7 @@ FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
 FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
 FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
 FHS_SBIN_DIR=$(FHS_INSTALL_ROOT)/sbin/
-FHS_SO_DIR=$(FHS_LIB_DIR)sope-4.3/products/
+FHS_SO_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/products/
 
 NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
 NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"

diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog
index a5f87a55e0042ab356df5c7c2cc7210026ae1566..c5b59975da559a4f9eb4d7ba48a4d5ffd86e6a85 100644 (file)
--- a/sope-appserver/WEExtensions/ChangeLog
+++ b/sope-appserver/WEExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-04  Helge Hess  <helge.hess@skyrix.com>
+
+       * use Version file for install directory location
+
 2004-10-21  Helge Hess  <helge.hess@skyrix.com>
 
        * WETableView/GNUmakefile: added support for config.make (v4.3.61)

diff --git a/sope-appserver/WEExtensions/GNUmakefile b/sope-appserver/WEExtensions/GNUmakefile
index 490b2c18f8ac7bd6eb6e377873b0c47dc504de12..2ffd62fb2d601c8ec4117db4c956922299df5758 100644 (file)
--- a/sope-appserver/WEExtensions/GNUmakefile
+++ b/sope-appserver/WEExtensions/GNUmakefile
@@ -8,7 +8,7 @@ include ./Version
 LIBRARY_NAME     = libWEExtensions
 BUNDLE_NAME      = WEExtensions
 BUNDLE_EXTENSION = .wox
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
 
 libWEExtensions_HEADER_FILES_DIR         = .
 libWEExtensions_HEADER_FILES_INSTALL_DIR = /WEExtensions

diff --git a/sope-appserver/WEExtensions/fhs.make b/sope-appserver/WEExtensions/fhs.make
index f87729b8cf4b8f6adfc6862c8950ef9ba0e61943..19e3d921b547c9b3fb13aebbe1468d050544710e 100644 (file)
--- a/sope-appserver/WEExtensions/fhs.make
+++ b/sope-appserver/WEExtensions/fhs.make
@@ -7,7 +7,7 @@ ifneq ($(FHS_INSTALL_ROOT),)
 FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
 FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
 FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
-FHS_WOx_DIR=$(FHS_LIB_DIR)sope-4.3/wox-builders/
+FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/
 
 NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
 NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"

diff --git a/sope-appserver/WOExtensions/ChangeLog b/sope-appserver/WOExtensions/ChangeLog
index cb9f18db07526b2d9ea507151086d553b2f5f441..4558e1c980bb14e675d3e0fd7a73fd3e39b8cd90 100644 (file)
--- a/sope-appserver/WOExtensions/ChangeLog
+++ b/sope-appserver/WOExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-04  Helge Hess  <helge.hess@skyrix.com>
+
+       * use Version file for install directory location
+
 2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * WOExtensions.xcode: fixed dependencies

diff --git a/sope-appserver/WOExtensions/GNUmakefile b/sope-appserver/WOExtensions/GNUmakefile
index bb8baed69b409656ab6d2b30085d69b43c55d40c..d7e36255875795b60046462198ce127a81f65b15 100644 (file)
--- a/sope-appserver/WOExtensions/GNUmakefile
+++ b/sope-appserver/WOExtensions/GNUmakefile
@@ -8,7 +8,7 @@ include ./Version
 LIBRARY_NAME     = libWOExtensions
 BUNDLE_NAME      = WOExtensions
 BUNDLE_EXTENSION = .wox
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
 
 libWOExtensions_HEADER_FILES_DIR        = .
 libWOExtensions_HEADER_FILES_INSTALL_DIR = /WOExtensions

diff --git a/sope-appserver/WOExtensions/fhs.make b/sope-appserver/WOExtensions/fhs.make
index 08e2932c4b84c5a4b49ee3d3b4ab023ab3ab653b..7a0d0b0f07c4e3c0de93872cbc483e9c2bdead8c 100644 (file)
--- a/sope-appserver/WOExtensions/fhs.make
+++ b/sope-appserver/WOExtensions/fhs.make
@@ -7,7 +7,7 @@ ifneq ($(FHS_INSTALL_ROOT),)
 FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
 FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
 FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
-FHS_WOx_DIR=$(FHS_LIB_DIR)sope-4.3/wox-builders/
+FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/
 
 NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
 NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"

diff --git a/sope-core/NGStreams/GNUmakefile.preamble b/sope-core/NGStreams/GNUmakefile.preamble
index 79a465be32e6547da8128bcea527729e95b342ec..19b71a122cf8116c4366868c55dc8504d39091bd 100644 (file)
--- a/sope-core/NGStreams/GNUmakefile.preamble
+++ b/sope-core/NGStreams/GNUmakefile.preamble
@@ -1,4 +1,4 @@
-# $Id$
+# compilation settings
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
 RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/..

diff --git a/sope-gdl1/PostgreSQL/ChangeLog b/sope-gdl1/PostgreSQL/ChangeLog
index 8bd4594b434b66c70316e8f7cbfa37bb622b98c3..62f20654b52cc2b4c261ac15022971429c4ff9c1 100644 (file)
--- a/sope-gdl1/PostgreSQL/ChangeLog
+++ b/sope-gdl1/PostgreSQL/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-04  Helge Hess  <helge.hess@skyrix.com>
+
+       * use Version file for install directory location
+
 2004-09-22  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * PostgreSQL.xcode: new Xcode project. This requires you have a recent

diff --git a/sope-gdl1/PostgreSQL/GNUmakefile b/sope-gdl1/PostgreSQL/GNUmakefile
index 4214f56e1a4cd75dcc4421e4ddcc941553ecb258..7796736c7ab2794648497d036d66d84b676ce550 100644 (file)
--- a/sope-gdl1/PostgreSQL/GNUmakefile
+++ b/sope-gdl1/PostgreSQL/GNUmakefile
@@ -24,6 +24,8 @@
 
 -include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
+include ../Version
+include ./Version
 
 BUNDLE_NAME = PostgreSQL
 
@@ -46,7 +48,7 @@ PostgreSQL_OBJC_FILES = \
 PostgreSQL_PRINCIPAL_CLASS = PostgreSQL72Adaptor
 
 BUNDLE_INSTALL     = PostgreSQL
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-1.1/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
 
 # Use .gdladaptor as the bundle extension
 BUNDLE_EXTENSION = .gdladaptor

diff --git a/sope-gdl1/PostgreSQL/Version b/sope-gdl1/PostgreSQL/Version
index 7087ff32410f53681d82e1380c7ec57332dea764..dd654be7d0711f6e0cc70f89e54300b5cd03af9c 100644 (file)
--- a/sope-gdl1/PostgreSQL/Version
+++ b/sope-gdl1/PostgreSQL/Version
@@ -1,3 +1,3 @@
-# $Id: Version 1 2004-08-20 10:38:46Z znek $
+# version file
 
 SUBMINOR_VERSION:=38

diff --git a/sope-gdl1/PostgreSQL/fhs.make b/sope-gdl1/PostgreSQL/fhs.make
index 1321dd983ec94be112acf3f05a8a960c04e5a812..6c5bd960d91b35712e403ed9c097468e80f3ec95 100644 (file)
--- a/sope-gdl1/PostgreSQL/fhs.make
+++ b/sope-gdl1/PostgreSQL/fhs.make
@@ -5,7 +5,7 @@
 ifneq ($(FHS_INSTALL_ROOT),)
 
 FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
-FHS_DB_DIR=$(FHS_LIB_DIR)sope-4.3/dbadaptors/
+FHS_DB_DIR=$(FHS_LIB_DIR)sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/dbadaptors/
 
 fhs-db-dirs ::
        $(MKDIRS) $(FHS_DB_DIR)

diff --git a/sope-gdl1/Version b/sope-gdl1/Version
index dceb8c2f716255969503479790bc350690a43596..9753f946aede80dbd7fb2429b4bb18db94995c9a 100644 (file)
--- a/sope-gdl1/Version
+++ b/sope-gdl1/Version
@@ -1,4 +1,3 @@
-# $Id: Version 1 2004-08-20 10:38:46Z znek $
 #
 # This file is included by library makefiles to set the version information 
 # of the executable.
@@ -6,3 +5,6 @@
 MAJOR_VERSION=1
 MINOR_VERSION=1
 # the SUBMINOR_VERSION is set by the Version file inside of a library project
+
+SOPE_MAJOR_VERSION=4
+SOPE_MINOR_VERSION=3

diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog
index 8509a88f31bb7c05238bc447d53f1925b96f0d42..a4bdd5be82f153e5c01515a45737efdc90daab0e 100644 (file)
--- a/sope-ical/NGiCal/ChangeLog
+++ b/sope-ical/NGiCal/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-04  Helge Hess  <helge.hess@skyrix.com>
+
+       * use Version file for install directory location of sax mapping
+
 2004-10-31  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * iCalAlarm.[hm], iCalEvent.[hm], iCalToDo.[hm],

diff --git a/sope-ical/NGiCal/GNUmakefile.postamble b/sope-ical/NGiCal/GNUmakefile.postamble
index c2be00a629e3f5ba4243743f076226831f9a272a..b02e10907ba1ad54651dcc403293bd6281c6cdce 100644 (file)
--- a/sope-ical/NGiCal/GNUmakefile.postamble
+++ b/sope-ical/NGiCal/GNUmakefile.postamble
@@ -1,9 +1,9 @@
-# $Id: GNUmakefile.postamble 5 2004-08-20 17:27:20Z helge $
+# compilation settings
 
 ifeq ($(FHS_INSTALL_ROOT),)
 MAPDIR="$(GNUSTEP_INSTALLATION_DIR)/Library/SaxMappings/"
 else
-MAPDIR="$(FHS_INSTALL_ROOT)/share/sope-4.3/saxmappings/"
+MAPDIR="$(FHS_INSTALL_ROOT)/share/sope-$(MAJOR_VERSION).$(MINOR_VERSION)/saxmappings/"
 endif
 
 mappings-dir ::

diff --git a/sope-ical/NGiCal/GNUmakefile.preamble b/sope-ical/NGiCal/GNUmakefile.preamble
index 88c4e46f39f4d152c2dbbaf40521772be721c4f2..d893f17a1edb470bb3716d1ed8493cd177576551 100644 (file)
--- a/sope-ical/NGiCal/GNUmakefile.preamble
+++ b/sope-ical/NGiCal/GNUmakefile.preamble
@@ -1,5 +1,4 @@
-# $Id$
-
+# compilation settings
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I. -I..                        \
@@ -7,7 +6,6 @@ ADDITIONAL_INCLUDE_DIRS += \
        -I../../sope-core               \
        -I../../sope-xml
 
-
 libNGiCal_LIBRARIES_DEPEND_UPON = \
        -lSaxObjC -lEOControl
 

diff --git a/sope-xml/STXSaxDriver/ChangeLog b/sope-xml/STXSaxDriver/ChangeLog
index e5c1a30bfe43d540f600eebbdf6f27a9adca47a9..a679446861ccf3fce0b18a3cb2f068e3fb2d507e 100644 (file)
--- a/sope-xml/STXSaxDriver/ChangeLog
+++ b/sope-xml/STXSaxDriver/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-04  Helge Hess  <helge.hess@skyrix.com>
+
+       * use Version file for install directory location
+
 2004-10-21  Helge Hess  <helge.hess@skyrix.com>
 
        * ExtraSTX/GNUmakefile, Model/GNUmakefile: fixed for config.make

diff --git a/sope-xml/STXSaxDriver/GNUmakefile b/sope-xml/STXSaxDriver/GNUmakefile
index 9c556bd87972bc187076b74080e3be8e1cbec64f..78fcf4cdcf3fd0b6d783a2fb6b0eabbf0245aaa9 100644 (file)
--- a/sope-xml/STXSaxDriver/GNUmakefile
+++ b/sope-xml/STXSaxDriver/GNUmakefile
@@ -2,10 +2,12 @@
 
 -include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
+include ../Version
+include ./Version
 
 BUNDLE_NAME        = STXSaxDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/
 
 STXSaxDriver_OBJC_FILES += \
        STXSaxDriver.m  \

diff --git a/sope-xml/STXSaxDriver/fhs.make b/sope-xml/STXSaxDriver/fhs.make
index ebaa53aeb44d1af7c2e54ecdd50118324ee55825..29e052314e835360f5dfaa9696043dfb97f90101 100644 (file)
--- a/sope-xml/STXSaxDriver/fhs.make
+++ b/sope-xml/STXSaxDriver/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-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/saxdrivers/
 
 fhs-sax-dirs ::
        $(MKDIRS) $(FHS_SAX_DIR)

diff --git a/sope-xml/Version b/sope-xml/Version
index 92d2867a5871f912fdbd23f39eeb368dae06fde3..ba7100f28d342701dfa6431027a280a3f24b0d8f 100644 (file)
--- a/sope-xml/Version
+++ b/sope-xml/Version
@@ -1,4 +1,3 @@
-# $Id$
 #
 # This file is included by library makefiles to set the version information 
 # of the executable.
@@ -6,3 +5,6 @@
 MAJOR_VERSION=4
 MINOR_VERSION=3
 # subminor versions are set in the Version files contained in the library path
+
+SOPE_MAJOR_VERSION=4
+SOPE_MINOR_VERSION=3

diff --git a/sope-xml/libxmlSAXDriver/ChangeLog b/sope-xml/libxmlSAXDriver/ChangeLog
index 4eeab8d44482f92513b8bd229bcf3e72da42a4f8..5dba5bb44a8cc2fed94c86a3e6842a37bde687a2 100644 (file)
--- a/sope-xml/libxmlSAXDriver/ChangeLog
+++ b/sope-xml/libxmlSAXDriver/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-04  Helge Hess  <helge.hess@skyrix.com>
+
+       * use Version file for install directory location
+
+2004-11-04  Helge Hess  <helge.hess@skyrix.com>
+
+       * fhs.make, GNUmakefile: use Version file to set install dir
+
 2004-09-22  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * libxmlSAXDriver.xcode: minor fixes

diff --git a/sope-xml/libxmlSAXDriver/GNUmakefile b/sope-xml/libxmlSAXDriver/GNUmakefile
index 2d5ee47258267112b1507328f3808148bd4b36dd..7bfa06a3fac81b4934d224c307e2403a9d4a6e77 100644 (file)
--- a/sope-xml/libxmlSAXDriver/GNUmakefile
+++ b/sope-xml/libxmlSAXDriver/GNUmakefile
@@ -2,10 +2,12 @@
 
 -include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
+include ../Version
+include ./Version
 
 BUNDLE_NAME        = libxmlSAXDriver
 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)/
 
 libxmlSAXDriver_OBJC_FILES = \
        libxmlSAXDriver.m       \

diff --git a/sope-xml/libxmlSAXDriver/fhs.make b/sope-xml/libxmlSAXDriver/fhs.make
index ebaa53aeb44d1af7c2e54ecdd50118324ee55825..5660415198d149caa3def5ace6273cacbfb42513 100644 (file)
--- a/sope-xml/libxmlSAXDriver/fhs.make
+++ b/sope-xml/libxmlSAXDriver/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)

diff --git a/sope-xml/pyxSAXDriver/ChangeLog b/sope-xml/pyxSAXDriver/ChangeLog
index c813d48d7e92fe9baa8e4d2ba05c5462ed5a6aea..af7f2f196c07a769231993fcc8d2d0cb8420033e 100644 (file)
--- a/sope-xml/pyxSAXDriver/ChangeLog
+++ b/sope-xml/pyxSAXDriver/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-04  Helge Hess  <helge.hess@skyrix.com>
+
+       * use Version file for install directory location
+
 2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
        
        * added hack to install the project in FHS locations - the SAX driver

diff --git a/sope-xml/pyxSAXDriver/GNUmakefile b/sope-xml/pyxSAXDriver/GNUmakefile
index dfb95b32af82a5e227d9e3dca372d32f0b525298..fcbf218e9dc24e659e6499fd3c57620f2fbfd893 100644 (file)
--- a/sope-xml/pyxSAXDriver/GNUmakefile
+++ b/sope-xml/pyxSAXDriver/GNUmakefile
@@ -2,10 +2,12 @@
 
 -include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
+include ../Version
+include ./Version
 
 BUNDLE_NAME        = pyxSAXDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SaxDrivers-4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SaxDrivers-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/
 
 pyxSAXDriver_OBJC_FILES = pyxSAXDriver.m
 

diff --git a/sope-xml/pyxSAXDriver/fhs.make b/sope-xml/pyxSAXDriver/fhs.make
index ebaa53aeb44d1af7c2e54ecdd50118324ee55825..29e052314e835360f5dfaa9696043dfb97f90101 100644 (file)
--- a/sope-xml/pyxSAXDriver/fhs.make
+++ b/sope-xml/pyxSAXDriver/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-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/saxdrivers/
 
 fhs-sax-dirs ::
        $(MKDIRS) $(FHS_SAX_DIR)