Merge trunk r3719

This commit is contained in:
Pierre Labastie 2013-09-17 13:45:07 +00:00
parent 89dffbf1c9
commit df08148a5b

View file

@ -59,7 +59,7 @@ extract_commands() { #
cd $JHALFSDIR cd $JHALFSDIR
case $PROGNAME in case $PROGNAME in
clfs*) clfs*)
VERSION=$(xmllint --noent BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;; VERSION=$(xmllint --noent $BOOK/BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;;
*) *)
VERSION=$(xmllint --noent $BOOK/prologue/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;; VERSION=$(xmllint --noent $BOOK/prologue/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;;
esac esac