fixed some FHS issues

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 06c8aabc3d7d811aee5f599547f9a79d13f7c088..c80a01b206d20c460ee19c0d494f6fb6ea7a77bc 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-01  Helge Hess  <helge.hess@opengroupware.org>
+
+       * fhs.make (move-headers-to-fhs): moved NGHttp headers to FHS root
+         (v4.3.21)
+
 2004-08-31  Helge Hess  <helge.hess@skyrix.com>
 
        * GNUmakefile.preamble: fixed sope-mime library location for gstep-make

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 9b1f7ac0e30b9dcff4bb2884b47997647c0dccbb..36c6d60ffb832d112753ff4a896bdd5c9307a133 100644 (file)
--- 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 6e4c5061fd54c43736c4241226bb015d2ffd1b86..aa5056d5400a8ea2180020765a91e6056abcb08c 100644 (file)
--- 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 c46f5a8319e14d51c7169f37789ac97081b32062..bbce5a3ec2bd1c1d6d65fc3e3d41e768f6eccc0c 100644 (file)
--- a/sope-ical/NGiCal/ChangeLog
+++ b/sope-ical/NGiCal/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-01  Helge Hess  <helge.hess@opengroupware.org>
+
+       * 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  <helge.hess@opengroupware.org>
 
        * 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 8a7e1591bfec557c7ddec8b89a914c7f2add2bfd..c2be00a629e3f5ba4243743f076226831f9a272a 100644 (file)
--- 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 45f93b53cd4842420fc9ba2125a11f952a0e68b2..d077e9f95e3d65c889ec0fd5e8fde3842fa4e229 100644 (file)
--- 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 0b361be89056205fcc81bbe4e3bd80564ed1ec8a..b6a6a9a116d081693b4ac8f344e5baedd7c33a4d 100644 (file)
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-01  Helge Hess  <helge.hess@opengroupware.org>
+
+       * fhs.make (move-headers-to-fhs): moved NGMail and NGImap4 headers to
+         FHS root (v4.3.177)
+
 2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
 
        * added hack to install the project in FHS locations - the library,

diff --git a/sope-mime/Version b/sope-mime/Version
index 7c3ed33761e542bab0c3103c387c4183f6a8e4de..2966e98cfd15c7e1514606532b11fe51fd573437 100644 (file)
--- 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 f90e8952e94cb8f9b178dde46e0d2a1d7126e8da..4a298aaca68988787035fe76e8563b0a523cc5d8 100644 (file)
--- 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) .."