| 1 |
--- configure.in 2006-03-14 00:56:19.000000000 -0500 |
| 2 |
+++ configure.in.new 2006-03-14 01:02:24.000000000 -0500 |
| 3 |
@@ -290,7 +290,7 @@ |
| 4 |
AM_CONDITIONAL(DBUS_USE_CSC, test x$enable_mono = xyes) |
| 5 |
|
| 6 |
#### Look for monodoc |
| 7 |
-MONODOC_REQUIRED_VERSION=0.16 |
| 8 |
+MONODOC_REQUIRED_VERSION=1.1.10 |
| 9 |
AC_SUBST(MONODOC_REQUIRED_VERSION) |
| 10 |
PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, have_monodoc=yes, have_monodoc=no) |
| 11 |
|
| 12 |
@@ -298,8 +298,9 @@ |
| 13 |
if test x$have_monodoc = xno ; then |
| 14 |
AC_MSG_ERROR([Building Mono docs explicitly required, but monodoc not found]) |
| 15 |
else |
| 16 |
- AC_PATH_PROG(MONODOC, monodoc, no) |
| 17 |
- if test x$MONODOC = xno; then |
| 18 |
+ AC_PATH_PROG(MONODOCER, monodocer, no) |
| 19 |
+ AC_PATH_PROG(MDASSEMBLER, mdassembler, no) |
| 20 |
+ if test x$MONODOCER = xno -o x$MDASSEMBLER = xno; then |
| 21 |
AC_MSG_ERROR([Building Mono docs explicitly required, but monodoc not found]) |
| 22 |
fi |
| 23 |
fi |
| 24 |
@@ -308,19 +309,26 @@ |
| 25 |
if test x$enable_mono_docs = xauto ; then |
| 26 |
if test x$have_monodoc = xno ; then |
| 27 |
enable_mono_docs=no |
| 28 |
- MONODOC= |
| 29 |
+ MONODOCER= |
| 30 |
+ MDASSEMBLER= |
| 31 |
else |
| 32 |
- AC_PATH_PROG(MONODOC, monodoc, no) |
| 33 |
- if test x$MONODOC = xno; then |
| 34 |
+ AC_PATH_PROG(MONODOCER, monodocer, no) |
| 35 |
+ AC_PATH_PROG(MDASSEMBLER, mdassembler, no) |
| 36 |
+ if test x$MONODOCER = xno -o x$MDASSEMBLER = xno; then |
| 37 |
enable_mono_docs=no |
| 38 |
- MONODOC= |
| 39 |
+ MONODOCER= |
| 40 |
+ MDASSEMBLER= |
| 41 |
else |
| 42 |
enable_mono_docs=yes |
| 43 |
fi |
| 44 |
fi |
| 45 |
fi |
| 46 |
|
| 47 |
-AC_SUBST(MONODOC) |
| 48 |
+MONODOC_SOURCESDIR=`pkg-config --variable=sourcesdir monodoc` |
| 49 |
+ |
| 50 |
+AC_SUBST(MONODOCER) |
| 51 |
+AC_SUBST(MDASSEMBLER) |
| 52 |
+AC_SUBST(MONODOC_SOURCESDIR) |
| 53 |
|
| 54 |
AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_mono_docs" = "xyes") |
| 55 |
|
| 56 |
--- mono/doc/Makefile.am 2006-02-10 16:47:10.000000000 -0500 |
| 57 |
+++ mono/doc/Makefile.am.new 2006-03-14 01:08:13.000000000 -0500 |
| 58 |
@@ -1,34 +1,30 @@ |
| 59 |
if ENABLE_MONODOC |
| 60 |
TARGETS = dbus-sharp-docs.zip dbus-sharp-docs.tree dbus-sharp-docs.source |
| 61 |
-DOCDIR = `$(MONODOC) --get-sourcesdir` |
| 62 |
|
| 63 |
install-data-local: |
| 64 |
- install -d -m 755 $(DESTDIR)/`monodoc --get-sourcesdir` |
| 65 |
- install -m 644 $(srcdir)/dbus-sharp-docs.source $(DESTDIR)/`monodoc --get-sourcesdir` |
| 66 |
- install -m 644 dbus-sharp-docs.tree $(DESTDIR)/`monodoc --get-sourcesdir` |
| 67 |
- install -m 644 dbus-sharp-docs.zip $(DESTDIR)/`monodoc --get-sourcesdir` |
| 68 |
+ install -d -m 755 $(DESTDIR)/$(MONODOC_SOURCESDIR) |
| 69 |
+ install -m 644 $(srcdir)/dbus-sharp-docs.source $(DESTDIR)/$(MONODOC_SOURCESDIR) |
| 70 |
+ install -m 644 dbus-sharp-docs.tree $(DESTDIR)/$(MONODOC_SOURCESDIR) |
| 71 |
+ install -m 644 dbus-sharp-docs.zip $(DESTDIR)/$(MONODOC_SOURCESDIR) |
| 72 |
|
| 73 |
uninstall-local: |
| 74 |
- rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.source |
| 75 |
- rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.tree |
| 76 |
- rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.zip |
| 77 |
+ rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/dbus-sharp-docs.source |
| 78 |
+ rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/dbus-sharp-docs.tree |
| 79 |
+ rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/dbus-sharp-docs.zip |
| 80 |
else |
| 81 |
TARGETS = |
| 82 |
-DOCDIR = $(datadir) |
| 83 |
endif |
| 84 |
|
| 85 |
noinst_DATA = $(TARGETS) |
| 86 |
|
| 87 |
-ASSEMBLER = $(MONODOC) --assemble |
| 88 |
-UPDATER = $(MONODOC) --update |
| 89 |
- |
| 90 |
dbus-sharp-docs.zip: dbus-sharp-docs.tree |
| 91 |
|
| 92 |
dbus-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml |
| 93 |
- $(ASSEMBLER) --ecma $(srcdir)/en -o dbus-sharp-docs |
| 94 |
+ $(MDASSEMBLER) --ecma $(srcdir)/en -o dbus-sharp-docs |
| 95 |
|
| 96 |
-update: |
| 97 |
- $(UPDATER) ../dbus-sharp.dll -o ./en -f |
| 98 |
+update: $(top_builddir)/mono/dbus-sharp.dll |
| 99 |
+ $(MONODOCER) -assembly:$(top_builddir)/mono/dbus-sharp.dll \ |
| 100 |
+ -path:en -updateto:en -delete |
| 101 |
|
| 102 |
CLEANFILES = dbus-sharp-docs.zip dbus-sharp-docs.tree |
| 103 |
|
Parent Directory
| 
Revision Log