Mon Dec 11 10:23:18 CET 2006 Paolo Molaro <lupus@ximian.com>

	* configure.in, mono.pc.in, */Makefile.am: istall the header
	files in a API version specific directory.

svn path=/trunk/mono/; revision=69303

diff --git a/ChangeLog b/ChangeLog
index 8789291ea40d5e9ffbe75de9e3a02ae4cf8a53ce..851d775b190c9c79ad106fbf9412d13aee40c009 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+
+Mon Dec 11 10:23:18 CET 2006 Paolo Molaro <lupus@ximian.com>
+
+       * configure.in, mono.pc.in, */Makefile.am: istall the header
+       files in a API version specific directory.
+
 2006-12-07  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * data/browscap.ini: added msdomversion for ie6/7,

diff --git a/configure.in b/configure.in
index c115b78ed49fab033dd29eee058724af0fcd898f..1fcaa0e7d21ece48c8be5614eb951da6015ba88a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,9 @@ AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(mono,1.2)
 AM_MAINTAINER_MODE
 
+API_VER=1.0
+AC_SUBST(API_VER)
+
 AC_PROG_LN_S
 
 # In case of cygwin, override LN_S, irrespective of what it determines.

diff --git a/mint.pc.in b/mint.pc.in
index 9486c6f1a7f667907bf25a1e1ab0ee6fa11ebb38..087e17b70061e33d5237c1fe203745f38c52309d 100644 (file)
--- a/mint.pc.in
+++ b/mint.pc.in
@@ -1,7 +1,7 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
 libdir=${prefix}/lib
-includedir=${prefix}/include
+includedir=${prefix}/include/mono-@API_VER@
 
 
 Name: Mono Interpreter

diff --git a/mono.pc.in b/mono.pc.in
index 1475699031319e589f8cb6dd1014d52940f63154..02f571d7e610a43e7f26e4d4ebe38b68dc13c6ba 100644 (file)
--- a/mono.pc.in
+++ b/mono.pc.in
@@ -1,7 +1,7 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
 libdir=${prefix}/@reloc_libdir@
-includedir=${prefix}/include
+includedir=${prefix}/include/mono-@API_VER@
 
 Name: Mono
 Description: Mono Runtime

diff --git a/mono/cil/Makefile.am b/mono/cil/Makefile.am
index 43e046d82b2ca38b3d77ad4971e569921435def0..8e2ac944823af7d7a67efed7bc3fd860a4ce070c 100644 (file)
--- a/mono/cil/Makefile.am
+++ b/mono/cil/Makefile.am
@@ -2,10 +2,10 @@ opcode.def: make-opcodes-def.pl cil-opcodes.xml
        perl $(srcdir)/make-opcodes-def.pl $(srcdir)/cil-opcodes.xml $@.tmp
        mv $@.tmp $@
 
-defdir = $(includedir)/mono/cil
+defdir = $(includedir)/mono-$(API_VER)/mono/cil
 def_DATA = opcode.def
 
-xmldir = $(datadir)/mono/cil
+xmldir = $(datadir)/mono-$(API_VER)/mono/cil
 xml_DATA = cil-opcodes.xml
 
 EXTRA_DIST=tables.def opcode.def make-opcodes-def.pl make-opcode-def.xsl $(xml_DATA) $(def_DATA)

diff --git a/mono/interpreter/Makefile.am b/mono/interpreter/Makefile.am
index cf8f2efaa62d0d6c5ddb0a4db7efe38aaa976378..1fbc990e6cb7f06cdec63680de5110e5d40c2c3a 100644 (file)
--- a/mono/interpreter/Makefile.am
+++ b/mono/interpreter/Makefile.am
@@ -32,7 +32,7 @@ libmint_la_SOURCES =  \
        mintops.c       \
        transform.c
 
-libmintincludedir = $(includedir)/mono/interpreter
+libmintincludedir = $(includedir)/mono-$(API_VER)/mono/interpreter
 
 libmintinclude_HEADERS =       \
        embed.h

diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am
index df9bac0f97a3c4a99cdc6203241ce2a11ea74dcf..654e331163a12c4874f9ebe238b14891d999ee83 100644 (file)
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = \
        -DMONO_BINDIR=\""$(bindir)"\"   \
        -I$(top_srcdir) 
 
-libwapiincludedir = $(includedir)/mono/io-layer
+libwapiincludedir = $(includedir)/mono-$(API_VER)/mono/io-layer
 
 OTHER_H = \
        access.h        \

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 1bfcbdac9d7f1edc884310a48d4c8389c5dd8ec9..5896ea75cf7c608c11e455a31c512baea84f7d94 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -125,7 +125,7 @@ libmonoruntime_static_la_SOURCES = $(libmonoruntime_la_SOURCES)
 
 libmonoruntime_static_la_LDFLAGS = -static
 
-libmonoruntimeincludedir = $(includedir)/mono/metadata
+libmonoruntimeincludedir = $(includedir)/mono-$(API_VER)/mono/metadata
 
 libmonoruntimeinclude_HEADERS = \
        attrdefs.h      \

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 229aa8e16b65b71e12a0d0c500de617cddb0681b..474927f77ea5f9785eb1dac1129e06e1dd7899e5 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -347,7 +347,7 @@ libmono_static_la_LIBADD = $(static_libs)
 
 BURGSRC= $(common_BURGSRC) $(arch_BURGSRC)
 
-libmonoincludedir = $(includedir)/mono/jit
+libmonoincludedir = $(includedir)/mono-$(API_VER)/mono/jit
 
 libmonoinclude_HEADERS = jit.h
 

diff --git a/mono/utils/Makefile.am b/mono/utils/Makefile.am
index 15a917c881ca15518bebd565743bf5fe5d2f5161..33cc83d13847971614559cd01f211a6464b321a0 100644 (file)
--- a/mono/utils/Makefile.am
+++ b/mono/utils/Makefile.am
@@ -27,7 +27,7 @@ libmonoutils_la_SOURCES = \
        mono-path.c     \
        mono-stdlib.c
 
-libmonoutilsincludedir = $(includedir)/mono/utils
+libmonoutilsincludedir = $(includedir)/mono-$(API_VER)/mono/utils
 
 libmonoutilsinclude_HEADERS = \
        monobitset.h    \