11:23 p.m.
# HG changeset patch
# User john.levon(a)sun.com
# Date 1233119659 28800
# Node ID cc848242fa810e8d0126b651849de715c7ef32e4
# Parent f91041f0c607be72c4b5695f081d20716521f6c5
Install schemas into correct location for Solaris
Signed-off-by: John Levon <john.levon(a)sun.com>
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -141,6 +141,10 @@ if test -n "$UDEVSETTLE"; then
AC_DEFINE_UNQUOTED([UDEVSETTLE],["$UDEVSETTLE"],
[Location or name of the udevsettle program])
fi
+
+SCHEMA_DIR=${pkgdatadir}/schemas
+test `uname -s` = SunOS && SCHEMA_DIR=${datadir}/lib/xml/rng/libvirt
+AC_SUBST([SCHEMA_DIR])
dnl Specific dir for HTML output ?
AC_ARG_WITH([html-dir], [AC_HELP_STRING([--with-html-dir=path],
diff --git a/docs/schemas/Makefile.am b/docs/schemas/Makefile.am
--- a/docs/schemas/Makefile.am
+++ b/docs/schemas/Makefile.am
@@ -1,6 +1,7 @@
-schemadir = $(pkgdatadir)/schemas
+schemadir = $(SCHEMA_DIR)
+
schema_DATA = \
domain.rng \
network.rng \
4:12 a.m.
john.levon(a)sun.com wrote:
Install schemas into correct location for Solaris
Signed-off-by: John Levon <john.levon(a)sun.com>
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -141,6 +141,10 @@ if test -n "$UDEVSETTLE"; then
AC_DEFINE_UNQUOTED([UDEVSETTLE],["$UDEVSETTLE"],
[Location or name of the udevsettle program])
fi
+
+SCHEMA_DIR=${pkgdatadir}/schemas
+test `uname -s` = SunOS && SCHEMA_DIR=${datadir}/lib/xml/rng/libvirt
ACK, but please drop the curly braces on the two lines above.
They just add unnecessary syntax.
5:20 a.m.
On Tue, Jan 27, 2009 at 09:23:52PM -0800, john.levon(a)sun.com wrote:
# HG changeset patch
# User john.levon(a)sun.com
# Date 1233119659 28800
# Node ID cc848242fa810e8d0126b651849de715c7ef32e4
# Parent f91041f0c607be72c4b5695f081d20716521f6c5
Install schemas into correct location for Solaris
Signed-off-by: John Levon <john.levon(a)sun.com>
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -141,6 +141,10 @@ if test -n "$UDEVSETTLE"; then
AC_DEFINE_UNQUOTED([UDEVSETTLE],["$UDEVSETTLE"],
[Location or name of the udevsettle program])
fi
+
+SCHEMA_DIR=${pkgdatadir}/schemas
+test `uname -s` = SunOS && SCHEMA_DIR=${datadir}/lib/xml/rng/libvirt
+AC_SUBST([SCHEMA_DIR])
I think it is desirable to have a standard location for libvirt
XML schemas that any application can rely on, regardless of OS.
I'd like to avoid apps like virt-manager having to look for RNG
files in a different place on each OS.
At the same time, obviously some OS may have standard locations
where XML parsers prefer to find these things.
So my preference would be to always install in
/usr/share/libvirt/schemas/
*and* then optionally also install the same files into an
OS specific location like your
/usr/share/lib/xml/rng/libvirt
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
5780
days inactive
5780
days old
2 comments
3 participants
participants (3)
-
Daniel P. Berrange -
Jim Meyering -
john.levon＠sun.com