diff options
| author | Arjan Bouter | 2010-06-29 19:37:19 +0200 |
|---|---|---|
| committer | Arjan Bouter | 2010-06-29 19:37:19 +0200 |
| commit | dc8e9fbc8b2287c132fd4788abb3b417f3dc723b (patch) | |
| tree | a46fbca7007b208680e54d6e59a6d8d5d4389224 | |
| parent | 48858a0fcd3ee04aaaa81c447f39b61d77c39f6f (diff) | |
gucharmap: fixed building without gtk-doc and scrollkeeper
| -rwxr-xr-x | gnome2-apps/gucharmap/BUILD | 8 | ||||
| -rwxr-xr-x | gnome2-apps/gucharmap/DEPENDS | 16 | ||||
| -rw-r--r-- | gnome2-apps/gucharmap/HISTORY | 4 |
3 files changed, 20 insertions, 8 deletions
diff --git a/gnome2-apps/gucharmap/BUILD b/gnome2-apps/gucharmap/BUILD index 47de76252f..3ec6b5fa8d 100755 --- a/gnome2-apps/gucharmap/BUILD +++ b/gnome2-apps/gucharmap/BUILD @@ -4,5 +4,11 @@ else OPTS="$OPTS --disable-unihan" fi && -default_build +if ! is_depends_enabled $SPELL gtk-doc; then + OPTS="$OPTS --disable-scrollkeeper" && + sedit 's/help//' Makefile.in && + sedit 's/^HELP_DIR.*/HELP_DIR =/' Makefile.in && + sedit '/DIST_SUBDIRS/s/help//' Makefile.in +fi && +default_build diff --git a/gnome2-apps/gucharmap/DEPENDS b/gnome2-apps/gucharmap/DEPENDS index 8f2a93ed72..dfa5031040 100755 --- a/gnome2-apps/gucharmap/DEPENDS +++ b/gnome2-apps/gucharmap/DEPENDS @@ -2,11 +2,6 @@ depends gtk+2 && depends gconf2 && depends libxml2 && -optional_depends rarian \ - '--enable-scrollkeeper' \ - '--disable-scrollkeeper' \ - 'Register with rarian?' && - optional_depends gobject-introspection \ "--enable-introspection" \ "--disable-introspection" \ @@ -14,5 +9,12 @@ optional_depends gobject-introspection \ optional_depends gtk-doc \ "--enable-gtk-doc" \ - "--disable-gtk-doc" \ - "to build documentation" + "--disable-gtk-doc --disable--gtk-doc-html" \ + "to build documentation" && + +if is_depends_enabled $SPELL gtk-doc; then +optional_depends rarian \ + '--enable-scrollkeeper' \ + '--disable-scrollkeeper' \ + 'Register with rarian?' +fi diff --git a/gnome2-apps/gucharmap/HISTORY b/gnome2-apps/gucharmap/HISTORY index ac334527ea..a8aca4ac6d 100644 --- a/gnome2-apps/gucharmap/HISTORY +++ b/gnome2-apps/gucharmap/HISTORY @@ -1,3 +1,7 @@ +2010-06-29 Arjan Bouter <abouter@sourcemage.org> + * DEPENDS,BUILD: allow building and installing without gtk-doc/scrollkeeper + and skip the scrollkeeper optional dep when gtk-doc is disabled + 2010-06-22 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.30.2 |