From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Mon, 11 Oct 2004 13:41:45 +0000 (+0000)
Subject: fixed a header file
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86c0fd629749e84ff0c60ce8ce6546153b50c433;p=sope

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 5476e938..d0a4a681 100644
--- 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 fa95f4f6..4ec44d07 100644
--- 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 ff4872d4..959125a8 100644
--- 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 fb935528..296c3b55 100644
--- 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 68b38c79..6ac86bcc 100644
--- 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