From a5726d9f304f713c29bfa11c89b203c5392776ad Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 3 Mar 2015 20:46:39 +0100 Subject: [PATCH] Updated upstream --- doc/gtkdoc.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/gtkdoc.sh b/doc/gtkdoc.sh index aab0685..7435a5e 100755 --- a/doc/gtkdoc.sh +++ b/doc/gtkdoc.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2012-2014 Pierre Pronchery +#Copyright (c) 2012-2015 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -141,7 +141,16 @@ while [ $# -gt 0 ]; do $DEBUG $MKDIR -- "$output" || exit 2 (cd "$output" && $DEBUG $GTKDOC_MKHTML "$MODULE" \ - "${OBJDIR}$driver") || exit 2 + "${OBJDIR}$driver") + #detect when gtk-doc is not available + res=$? + if [ $res -eq 127 ]; then + _error "$GTKDOC_MKHTML: Not available" \ + "(not generating documentation)" + continue + elif [ $res -ne 0 ]; then + exit 2 + fi output="${OBJDIR}gtkdoc" (cd "$output" && $DEBUG $GTKDOC_FIXXREF \