From a14ac68bd7e2ffad7e23b63af1d7431e1af7a54d Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 4 Nov 2004 15:24:58 +0000 Subject: [PATCH] use Version file for install locations git-svn-id: http://svn.opengroupware.org/SOPE/trunk@341 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- INSTALL | 2 +- README | 4 +--- TODO-4.3.txt | 13 ------------- TODO.txt | 5 +++++ sope-appserver/NGObjWeb/ChangeLog | 4 ++++ sope-appserver/NGObjWeb/GNUmakefile | 2 +- sope-appserver/NGObjWeb/fhs.make | 2 +- sope-appserver/SoOFS/ChangeLog | 4 ++++ sope-appserver/SoOFS/GNUmakefile | 2 +- sope-appserver/SoOFS/fhs.make | 2 +- sope-appserver/WEExtensions/ChangeLog | 4 ++++ sope-appserver/WEExtensions/GNUmakefile | 2 +- sope-appserver/WEExtensions/fhs.make | 2 +- sope-appserver/WOExtensions/ChangeLog | 4 ++++ sope-appserver/WOExtensions/GNUmakefile | 2 +- sope-appserver/WOExtensions/fhs.make | 2 +- sope-core/NGStreams/GNUmakefile.preamble | 2 +- sope-gdl1/PostgreSQL/ChangeLog | 4 ++++ sope-gdl1/PostgreSQL/GNUmakefile | 4 +++- sope-gdl1/PostgreSQL/Version | 2 +- sope-gdl1/PostgreSQL/fhs.make | 2 +- sope-gdl1/Version | 4 +++- sope-ical/NGiCal/ChangeLog | 4 ++++ sope-ical/NGiCal/GNUmakefile.postamble | 4 ++-- sope-ical/NGiCal/GNUmakefile.preamble | 4 +--- sope-xml/STXSaxDriver/ChangeLog | 4 ++++ sope-xml/STXSaxDriver/GNUmakefile | 4 +++- sope-xml/STXSaxDriver/fhs.make | 2 +- sope-xml/Version | 4 +++- sope-xml/libxmlSAXDriver/ChangeLog | 8 ++++++++ sope-xml/libxmlSAXDriver/GNUmakefile | 4 +++- sope-xml/libxmlSAXDriver/fhs.make | 2 +- sope-xml/pyxSAXDriver/ChangeLog | 4 ++++ sope-xml/pyxSAXDriver/GNUmakefile | 4 +++- sope-xml/pyxSAXDriver/fhs.make | 2 +- 35 files changed, 82 insertions(+), 42 deletions(-) delete mode 100644 TODO-4.3.txt create mode 100644 TODO.txt diff --git a/INSTALL b/INSTALL index 887a2c84..322d9968 100644 --- 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 ec5c18f2..0ca6ac79 100644 --- 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 index c83bfdc5..00000000 --- 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 index 00000000..9cabfca1 --- /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 7a8f6dcd..f49b2a61 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,7 @@ +2004-11-04 Helge Hess + + * use Version file for install directory location + 2004-11-03 Marcus Mueller * DynamicElements/*.api: provided formal specifications for all diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile index f7a123f0..ca13c991 100644 --- 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 aa5056d5..7109fc8d 100644 --- 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 1580d7a3..0d6bb9ba 100644 --- a/sope-appserver/SoOFS/ChangeLog +++ b/sope-appserver/SoOFS/ChangeLog @@ -1,3 +1,7 @@ +2004-11-04 Helge Hess + + * use Version file for install directory location + 2004-10-12 Helge Hess * sope.m: minor logging improvements (v4.3.12) diff --git a/sope-appserver/SoOFS/GNUmakefile b/sope-appserver/SoOFS/GNUmakefile index a581b9a3..54b720b8 100644 --- 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 e260862c..c28f854e 100644 --- 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 a5f87a55..c5b59975 100644 --- a/sope-appserver/WEExtensions/ChangeLog +++ b/sope-appserver/WEExtensions/ChangeLog @@ -1,3 +1,7 @@ +2004-11-04 Helge Hess + + * use Version file for install directory location + 2004-10-21 Helge Hess * WETableView/GNUmakefile: added support for config.make (v4.3.61) diff --git a/sope-appserver/WEExtensions/GNUmakefile b/sope-appserver/WEExtensions/GNUmakefile index 490b2c18..2ffd62fb 100644 --- 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 f87729b8..19e3d921 100644 --- 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 cb9f18db..4558e1c9 100644 --- a/sope-appserver/WOExtensions/ChangeLog +++ b/sope-appserver/WOExtensions/ChangeLog @@ -1,3 +1,7 @@ +2004-11-04 Helge Hess + + * use Version file for install directory location + 2004-09-21 Marcus Mueller * WOExtensions.xcode: fixed dependencies diff --git a/sope-appserver/WOExtensions/GNUmakefile b/sope-appserver/WOExtensions/GNUmakefile index bb8baed6..d7e36255 100644 --- 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 08e2932c..7a0d0b0f 100644 --- 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 79a465be..19b71a12 100644 --- 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 8bd4594b..62f20654 100644 --- a/sope-gdl1/PostgreSQL/ChangeLog +++ b/sope-gdl1/PostgreSQL/ChangeLog @@ -1,3 +1,7 @@ +2004-11-04 Helge Hess + + * use Version file for install directory location + 2004-09-22 Marcus Mueller * PostgreSQL.xcode: new Xcode project. This requires you have a recent diff --git a/sope-gdl1/PostgreSQL/GNUmakefile b/sope-gdl1/PostgreSQL/GNUmakefile index 4214f56e..7796736c 100644 --- 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 7087ff32..dd654be7 100644 --- 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 1321dd98..6c5bd960 100644 --- 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 dceb8c2f..9753f946 100644 --- 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 8509a88f..a4bdd5be 100644 --- a/sope-ical/NGiCal/ChangeLog +++ b/sope-ical/NGiCal/ChangeLog @@ -1,3 +1,7 @@ +2004-11-04 Helge Hess + + * use Version file for install directory location of sax mapping + 2004-10-31 Marcus Mueller * iCalAlarm.[hm], iCalEvent.[hm], iCalToDo.[hm], diff --git a/sope-ical/NGiCal/GNUmakefile.postamble b/sope-ical/NGiCal/GNUmakefile.postamble index c2be00a6..b02e1090 100644 --- 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 88c4e46f..d893f17a 100644 --- 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 e5c1a30b..a6794468 100644 --- a/sope-xml/STXSaxDriver/ChangeLog +++ b/sope-xml/STXSaxDriver/ChangeLog @@ -1,3 +1,7 @@ +2004-11-04 Helge Hess + + * use Version file for install directory location + 2004-10-21 Helge Hess * ExtraSTX/GNUmakefile, Model/GNUmakefile: fixed for config.make diff --git a/sope-xml/STXSaxDriver/GNUmakefile b/sope-xml/STXSaxDriver/GNUmakefile index 9c556bd8..78fcf4cd 100644 --- 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 ebaa53ae..29e05231 100644 --- 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 92d2867a..ba7100f2 100644 --- 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 4eeab8d4..5dba5bb4 100644 --- a/sope-xml/libxmlSAXDriver/ChangeLog +++ b/sope-xml/libxmlSAXDriver/ChangeLog @@ -1,3 +1,11 @@ +2004-11-04 Helge Hess + + * use Version file for install directory location + +2004-11-04 Helge Hess + + * fhs.make, GNUmakefile: use Version file to set install dir + 2004-09-22 Marcus Mueller * libxmlSAXDriver.xcode: minor fixes diff --git a/sope-xml/libxmlSAXDriver/GNUmakefile b/sope-xml/libxmlSAXDriver/GNUmakefile index 2d5ee472..7bfa06a3 100644 --- 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 ebaa53ae..56604151 100644 --- 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 c813d48d..af7f2f19 100644 --- a/sope-xml/pyxSAXDriver/ChangeLog +++ b/sope-xml/pyxSAXDriver/ChangeLog @@ -1,3 +1,7 @@ +2004-11-04 Helge Hess + + * use Version file for install directory location + 2004-08-29 Helge Hess * 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 dfb95b32..fcbf218e 100644 --- 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 ebaa53ae..29e05231 100644 --- 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) -- 2.39.5