fixed a header file

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 5476e938edeaae841690563edc375dfc93f3b012..d0a4a6811cd9d4d4de930876077d451ec798a5c3 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-11  Helge Hess  <helge.hess@opengroupware.org>
-       
+
+       * SoObjects/SoPageInvocation.h: fixed header file (install include and
+         compile include differ :-|) (v4.3.60)
+
        * v4.3.59
        
        * SoObjects/SoProductClassInfo.m: added support for action invocations

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index fa95f4f69dc1348b2f536abc5e49d904dfa108e9..4ec44d0741c0c2c7b341492f327be67860aa3064 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile.preamble 25 2004-08-20 23:01:07Z helge $
+# compilation settings
 
 ADDITIONAL_CPPFLAGS += \
         -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \

diff --git a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble
index ff4872d48b8fd64a4acd1a056970628199d18130..959125a8774fd0b6aa3f7b8525dc13992d6089d4 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble
@@ -1,3 +1,5 @@
-# $Id$
+# compilation settings
 
 ADDITIONAL_INCLUDE_DIRS += -I../WebDAV/
+
+ADDITIONAL_CPPFLAGS += -DCOMPILING_NGOBJWEB=1

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoPageInvocation.h b/sope-appserver/NGObjWeb/SoObjects/SoPageInvocation.h
index fb935528cfff75e1e819618a440aaee2dd06b954..296c3b556f5efaac931c3dbfff3b8e267a4ca867 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoPageInvocation.h
+++ b/sope-appserver/NGObjWeb/SoObjects/SoPageInvocation.h
@@ -22,7 +22,11 @@
 #ifndef __SoObjects_SoPageInvocation_H__
 #define __SoObjects_SoPageInvocation_H__
 
-#include <SoObjects/SoActionInvocation.h>
+#if COMPILING_NGOBJWEB
+#  include <SoObjects/SoActionInvocation.h>
+#else
+#  include <NGObjWeb/SoActionInvocation.h>
+#endif
 
 /*
   An invocation object for WOComponent based SoClass methods.

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 68b38c79e32adcba65f334905d6d2591bad7481a..6ac86bcca69f739c90193fd260509637fb13ca67 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=59
+SUBMINOR_VERSION:=60
 
 # v4.3.42  requires libNGExtensions v4.3.116
 # v4.3.40  requires libNGExtensions v4.3.115