GNOME.org
 

orbit1 patch landed

Hi,

This is what I put in just to get moving on the parallel install
thing, can fix it up as required, let me know.

Havoc

Index: orbit-config.in
===================================================================
RCS file: /cvs/gnome/ORBit/orbit-config.in,v
retrieving revision 1.7.4.1
diff -u -p -u -r1.7.4.1 orbit-config.in
--- orbit-config.in	2001/09/07 17:55:03	1.7.4.1
+++ orbit-config.in	2001/09/19 16:59:47
@@ -3,7 +3,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
-includedir=@includedir@
+includedir=@includedir@/orbit-1.0
 libdir=@libdir@
 
 usage()
Index: libIDL/Makefile.am
===================================================================
RCS file: /cvs/gnome/libIDL/Makefile.am,v
retrieving revision 1.65.4.3
diff -u -p -u -r1.65.4.3 Makefile.am
--- libIDL/Makefile.am	2000/09/30 02:09:43	1.65.4.3
+++ libIDL/Makefile.am	2001/09/19 16:59:47
@@ -36,7 +36,8 @@ EXTRA_DIST		= BUGS parser.y lexer.l \
 			  libIDL.pc.in
 
 info_TEXINFOS		= libIDL.texi
-pkginclude_HEADERS	= IDL.h
+libidlincludedir        = $(includedir)/libIDL-1.0/libIDL
+libidlinclude_HEADERS	= IDL.h
 lib_LTLIBRARIES		= libIDL.la
 noinst_PROGRAMS		= tstidl
 
Index: libIDL/libIDL-config.in
===================================================================
RCS file: /cvs/gnome/libIDL/libIDL-config.in,v
retrieving revision 1.3
diff -u -p -u -r1.3 libIDL-config.in
--- libIDL/libIDL-config.in	1999/04/16 14:52:20	1.3
+++ libIDL/libIDL-config.in	2001/09/19 16:59:47
@@ -50,9 +50,7 @@ while test $# -gt 0; do
       exit 0
       ;;
     --cflags)
-      if test "@includedir@" != /usr/include ; then
-        includes="-I@includedir@"
-      fi
+      includes="-I@includedir@/libIDL-1.0"
       echo_cflags=yes
       ;;
     --libs)
Index: src/IIOP/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/IIOP/Makefile.am,v
retrieving revision 1.21.4.1
diff -u -p -u -r1.21.4.1 Makefile.am
--- src/IIOP/Makefile.am	2000/04/05 19:14:44	1.21.4.1
+++ src/IIOP/Makefile.am	2001/09/19 16:59:47
@@ -8,13 +8,11 @@ libwrap_files=
 libwrap_deps=$(LIB_WRAP)
 endif
 
-libIIOPincludedir = $(includedir)/ORBit/IIOP
-
 INCLUDES=-I.. -I$(top_srcdir)/src @GLIB_CFLAGS@ -I$(top_builddir)/src/ORBitutil
 
 lib_LTLIBRARIES=libIIOP.la
 
-libIIOPincludedir = $(includedir)/IIOP
+libIIOPincludedir = $(includedir)/orbit-1.0/IIOP
 
 libIIOP_la_SOURCES= \
 	connection.c \
Index: src/ORBitutil/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/ORBitutil/Makefile.am,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile.am
--- src/ORBitutil/Makefile.am	1999/11/13 17:09:59	1.16
+++ src/ORBitutil/Makefile.am	2001/09/19 16:59:47
@@ -2,7 +2,7 @@ INCLUDES=-I$(top_builddir)/src -I$(top_s
 
 lib_LTLIBRARIES=libORBitutil.la
 
-libORBitutilincludedir = $(includedir)/ORBitutil
+libORBitutilincludedir = $(includedir)/orbit-1.0/ORBitutil
 
 libORBitutil_la_SOURCES = \
 	trace.c \
Index: src/orb/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/orb/Makefile.am,v
retrieving revision 1.49.4.3
diff -u -p -u -r1.49.4.3 Makefile.am
--- src/orb/Makefile.am	2001/09/11 22:25:38	1.49.4.3
+++ src/orb/Makefile.am	2001/09/19 16:59:47
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-libORBitincludedir = $(includedir)/ORBit
-
 INCLUDES =-I.. -I$(top_srcdir)/src @GLIB_CFLAGS@ \
 	-DORBit_SYSRC=\"$(sysconfdir)/orbitrc\" \
 	-I$(top_builddir)/src/ORBitutil \
@@ -13,7 +11,7 @@ INCLUDES =-I.. -I$(top_srcdir)/src @GLIB
 
 lib_LTLIBRARIES = libORBit.la
 
-libORBitincludedir = $(includedir)/orb
+libORBitincludedir = $(includedir)/orbit-1.0/orb
 
 EXTRA_DIST=orbit.h.in
 
Index: src/orbit-idl-compiler/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/orbit-idl-compiler/Makefile.am,v
retrieving revision 1.13.4.2
diff -u -p -u -r1.13.4.2 Makefile.am
--- src/orbit-idl-compiler/Makefile.am	2000/07/14 14:38:35	1.13.4.2
+++ src/orbit-idl-compiler/Makefile.am	2001/09/19 16:59:47
@@ -1,7 +1,7 @@
 SUBDIRS=backends
 bin_PROGRAMS=orbit-idl
 
-includedir=$(prefix)/include
+orbitidlincludedir=$(includedir)/orbit-1.0
 orbitlibdir=$(libdir)/orbit-idl
 
 INCLUDES=-I$(top_builddir) -I$(top_builddir)/src \
@@ -28,7 +28,7 @@ orbit_idl_SOURCES=orbit-idl-main.c \
 		   orbit-idl-genmarshal.c \
 		   orbit-idl-utils.c \
 		   orbit-idl2.h
-include_DATA=orbit-idl2.h
+orbitidlinclude_HEADERS=orbit-idl2.h
 
 $(top_builddir)/libIDL/libIDL.la:
 	$(MAKE) -C $(top_builddir)/libIDL libIDL.la
Index: src/services/event/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/services/event/Makefile.am,v
retrieving revision 1.15
diff -u -p -u -r1.15 Makefile.am
--- src/services/event/Makefile.am	2000/01/24 20:05:51	1.15
+++ src/services/event/Makefile.am	2001/09/19 16:59:47
@@ -1,4 +1,4 @@
-libORBitservicesincludedir = $(includedir)/ORBitservices
+libORBitservicesincludedir = $(includedir)/orbit-1.0/ORBitservices
 
 libORBitservicesinclude_HEADERS =  					\
 	CosEventComm.idl						\
Index: src/services/name/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/services/name/Makefile.am,v
retrieving revision 1.29
diff -u -p -u -r1.29 Makefile.am
--- src/services/name/Makefile.am	2000/01/24 20:05:51	1.29
+++ src/services/name/Makefile.am	2001/09/19 16:59:47
@@ -1,4 +1,4 @@
-libORBitservicesincludedir = $(includedir)/ORBitservices
+libORBitservicesincludedir = $(includedir)/orbit-1.0/ORBitservices
 
 lib_LTLIBRARIES=libORBitCosNaming.la
 
Index: src/services/time/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/services/time/Makefile.am,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile.am
--- src/services/time/Makefile.am	1999/06/24 15:16:00	1.4
+++ src/services/time/Makefile.am	2001/09/19 16:59:47
@@ -1,4 +1,4 @@
-libORBitservicesincludedir = $(includedir)/ORBitservices
+libORBitservicesincludedir = $(includedir)/orbit-1.0/ORBitservices
 
 libORBitservicesinclude_HEADERS =  					\
 	CosTime.idl \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]