diff options
| author | Stefano Karapetsas <[email protected]> | 2013-07-16 23:55:24 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-07-16 23:55:24 +0200 |
| commit | 894f62a7af6124c71496c6a4ec30daea582924b9 (patch) | |
| tree | dfd7e630f0532ea8045d8ff5dca28a5d059355ed | |
| parent | 6e310bd968ba9d6651dd1092660271fed16e498a (diff) | |
| download | mate-common-894f62a7af6124c71496c6a4ec30daea582924b9.tar.bz2 mate-common-894f62a7af6124c71496c6a4ec30daea582924b9.tar.xz | |
Replace mate-doc-utils with yelp-tools
| -rw-r--r-- | macros/mate-autogen | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/macros/mate-autogen b/macros/mate-autogen index c84961e..b231084 100644 --- a/macros/mate-autogen +++ b/macros/mate-autogen @@ -31,7 +31,6 @@ REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.25} REQUIRED_PKG_CONFIG_VERSION=${REQUIRED_PKG_CONFIG_VERSION:-0.14.0} REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0} REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-1.1.0} -REQUIRED_MATE_DOC_UTILS_VERSION=${REQUIRED_MATE_DOC_UTILS_VERSION:-1.1.0} # a list of required m4 macros. Package can set an initial value REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-} @@ -272,7 +271,7 @@ want_glib_gettext=false want_intltool=false want_pkg_config=false want_gtk_doc=false -want_mate_doc_utils=false +want_yelp_tools=false want_maintainer_mode=false configure_files="`find $srcdir -name '{arch}' -prune -o -name '_darcs' -prune -o -name '.??*' -prune -o -name configure.ac -print -o -name configure.in -print`" @@ -302,8 +301,8 @@ for configure_ac in $configure_files; do if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then want_gtk_doc=true fi - if grep "^MATE_DOC_INIT" $configure_ac >/dev/null; then - want_mate_doc_utils=true + if grep "^YELP_HELP_INIT" $configure_ac >/dev/null; then + want_yelp_tools=true fi # check that AM_MAINTAINER_MODE is used @@ -383,9 +382,8 @@ if $want_gtk_doc; then require_m4macro gtk-doc.m4 fi -if $want_mate_doc_utils; then - version_check mate-doc-utils MATE_DOC_PREPARE mate-doc-prepare $REQUIRED_MATE_DOC_UTILS_VERSION \ - "http://pub.mate-desktop.org/releases/" +if $want_yelp_tools; then + require_m4macro yelp.m4 fi if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then @@ -452,10 +450,6 @@ for configure_ac in $configure_files; do printbold "Running mate-doc-common..." mate-doc-common --copy || exit 1 fi - if grep "^MATE_DOC_INIT" $basename >/dev/null; then - printbold "Running $MATE_DOC_PREPARE..." - $MATE_DOC_PREPARE --force --copy || exit 1 - fi # Now run aclocal to pull in any additional macros needed |