From f8ff1983d8fa023728956e6c984f6be4c30c22b5 Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 1 Sep 2004 05:29:39 +0000 Subject: [PATCH] fixed some FHS issues git-svn-id: http://svn.opengroupware.org/SOPE/trunk@99 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 +++++ sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/fhs.make | 2 ++ sope-ical/NGiCal/ChangeLog | 5 +++++ sope-ical/NGiCal/GNUmakefile.postamble | 10 ++++++++-- sope-ical/NGiCal/Version | 2 +- sope-mime/ChangeLog | 5 +++++ sope-mime/Version | 2 +- sope-mime/fhs.make | 4 ++++ 9 files changed, 32 insertions(+), 5 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 06c8aabc..c80a01b2 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2004-09-01 Helge Hess + + * fhs.make (move-headers-to-fhs): moved NGHttp headers to FHS root + (v4.3.21) + 2004-08-31 Helge Hess * GNUmakefile.preamble: fixed sope-mime library location for gstep-make diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 9b1f7ac0..36c6d60f 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=20 +SUBMINOR_VERSION:=21 # v4.2.413 requires libSaxObjC v4.2.33 # v4.2.341 requires libNGExtensions v4.2.77 diff --git a/sope-appserver/NGObjWeb/fhs.make b/sope-appserver/NGObjWeb/fhs.make index 6e4c5061..aa5056d5 100644 --- a/sope-appserver/NGObjWeb/fhs.make +++ b/sope-appserver/NGObjWeb/fhs.make @@ -16,6 +16,7 @@ NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)" fhs-header-dirs :: $(MKDIRS) $(FHS_INCLUDE_DIR)$(libNGObjWeb_HEADER_FILES_INSTALL_DIR) + $(MKDIRS) $(FHS_INCLUDE_DIR)/NGHttp fhs-bin-dirs :: $(MKDIRS) $(FHS_BIN_DIR) @@ -28,6 +29,7 @@ move-headers-to-fhs :: fhs-header-dirs @echo "moving headers to $(FHS_INCLUDE_DIR) .." mv $(GNUSTEP_HEADERS)$(libNGObjWeb_HEADER_FILES_INSTALL_DIR)/*.h \ $(FHS_INCLUDE_DIR)$(libNGObjWeb_HEADER_FILES_INSTALL_DIR)/ + mv $(GNUSTEP_HEADERS)/NGHttp/*.h $(FHS_INCLUDE_DIR)/NGHttp/ move-libs-to-fhs :: @echo "moving libs to $(FHS_LIB_DIR) .." diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog index c46f5a83..bbce5a3e 100644 --- a/sope-ical/NGiCal/ChangeLog +++ b/sope-ical/NGiCal/ChangeLog @@ -1,3 +1,8 @@ +2004-09-01 Helge Hess + + * GNUmakefile.postamble: copy sax-model to FHS_INSTALL_ROOT + + /share/sope-4.3/saxmappings/ when compiling for FHS (v4.3.28) + 2004-08-29 Helge Hess * added hack to install the project in FHS locations - the library, diff --git a/sope-ical/NGiCal/GNUmakefile.postamble b/sope-ical/NGiCal/GNUmakefile.postamble index 8a7e1591..c2be00a6 100644 --- a/sope-ical/NGiCal/GNUmakefile.postamble +++ b/sope-ical/NGiCal/GNUmakefile.postamble @@ -1,7 +1,13 @@ -# $Id$ +# $Id: GNUmakefile.postamble 5 2004-08-20 17:27:20Z helge $ +ifeq ($(FHS_INSTALL_ROOT),) MAPDIR="$(GNUSTEP_INSTALLATION_DIR)/Library/SaxMappings/" +else +MAPDIR="$(FHS_INSTALL_ROOT)/share/sope-4.3/saxmappings/" +endif -after-install :: +mappings-dir :: $(MKDIRS) $(MAPDIR) + +after-install :: mappings-dir cp NGiCal.xmap $(MAPDIR) diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version index 45f93b53..d077e9f9 100644 --- a/sope-ical/NGiCal/Version +++ b/sope-ical/NGiCal/Version @@ -2,4 +2,4 @@ MAJOR_VERSION=4 MINOR_VERSION=3 -SUBMINOR_VERSION:=27 +SUBMINOR_VERSION:=28 diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog index 0b361be8..b6a6a9a1 100644 --- a/sope-mime/ChangeLog +++ b/sope-mime/ChangeLog @@ -1,3 +1,8 @@ +2004-09-01 Helge Hess + + * fhs.make (move-headers-to-fhs): moved NGMail and NGImap4 headers to + FHS root (v4.3.177) + 2004-08-29 Helge Hess * added hack to install the project in FHS locations - the library, diff --git a/sope-mime/Version b/sope-mime/Version index 7c3ed337..2966e98c 100644 --- a/sope-mime/Version +++ b/sope-mime/Version @@ -2,6 +2,6 @@ MAJOR_VERSION:=4 MINOR_VERSION:=3 -SUBMINOR_VERSION:=176 +SUBMINOR_VERSION:=177 # v4.2.149 requires libNGStreams v4.2.34 diff --git a/sope-mime/fhs.make b/sope-mime/fhs.make index f90e8952..4a298aac 100644 --- a/sope-mime/fhs.make +++ b/sope-mime/fhs.make @@ -14,12 +14,16 @@ NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)" fhs-header-dirs :: $(MKDIRS) $(FHS_INCLUDE_DIR)$(libNGMime_HEADER_FILES_INSTALL_DIR) + $(MKDIRS) $(FHS_INCLUDE_DIR)/NGImap4 + $(MKDIRS) $(FHS_INCLUDE_DIR)/NGMail move-headers-to-fhs :: fhs-header-dirs @echo "moving headers to $(FHS_INCLUDE_DIR) .." mv $(GNUSTEP_HEADERS)$(libNGMime_HEADER_FILES_INSTALL_DIR)/*.h \ $(FHS_INCLUDE_DIR)$(libNGMime_HEADER_FILES_INSTALL_DIR)/ + mv $(GNUSTEP_HEADERS)/NGImap4/*.h $(FHS_INCLUDE_DIR)/NGImap4/ + mv $(GNUSTEP_HEADERS)/NGMail/*.h $(FHS_INCLUDE_DIR)/NGMail/ move-libs-to-fhs :: @echo "moving libs to $(FHS_LIB_DIR) .." -- 2.39.5