Updating branch refs/heads/master to fd5e491d10fa94f5803f12279f23729c663b43ab (commit) from 69e11e92f5c7083bdf63a3a3cfe479505021d4d3 (commit)
commit fd5e491d10fa94f5803f12279f23729c663b43ab Author: Jannis Pohlmann <jan...@xfce.org> Date: Thu Sep 17 03:13:01 2009 +0200 Fix docs for make distcheck. Update to xfce4-dev-tools 4.7.0. autogen.sh | 28 ++-------------------------- configure.in.in | 6 +++--- docs/reference/Makefile.am | 3 +++ 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/autogen.sh b/autogen.sh index e7ad211..c3305b7 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,7 +2,7 @@ # # $Id$ # -# vi:set ts=2 sw=2 et ai: +# vi:set et ai sw=2 sts=2 ts=2: # # Copyright (c) 2007 # The Xfce development team. All rights reserved. @@ -20,28 +20,4 @@ EOF exit 1 } -# Verify that po/LINGUAS is present -(test -f po/LINGUAS) >/dev/null 2>&1 || { - cat >&2 <<EOF -autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot - or try to checkout again. -EOF - exit 1 -} - -# Substitute revision and linguas -linguas=`sed -e '/^#/d' po/LINGUAS` -if test -d .git/svn; then - revision=$(git svn find-rev trunk 2>/dev/null || - git svn find-rev origin/trunk 2>/dev/null || - git svn find-rev HEAD 2>/dev/null || - git svn find-rev master 2>/dev/null) -else - revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",$2}'` -fi -sed -e "s/@LINGUAS@/${linguas}/g" \ - -e "s/@REVISION@/${revision}/g" \ - < "configure.in.in" > "configure.in" - -exec xdt-autogen $@ - +XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" exec xdt-autogen $@ diff --git a/configure.in.in b/configure.in.in index 0a411c3..d245d43 100644 --- a/configure.in.in +++ b/configure.in.in @@ -17,13 +17,13 @@ m4_define([libxfce4menu_version_minor], [6]) m4_define([libxfce4menu_version_micro], [1]) m4_define([libxfce4menu_version_nano], []) m4_define([libxfce4menu_version_build], [...@revision@]) -m4_define([libxfce4menu_version_tag], []) -m4_define([libxfce4menu_version], [libxfce4menu_version_major().libxfce4menu_version_minor().libxfce4menu_version_micro()ifelse(libxfce4menu_version_nano(), [], [], [.libxfce4menu_version_nano()])ifelse(libxfce4menu_version_tag(), [svn], [libxfce4menu_version_tag()-libxfce4menu_version_build()], [libxfce4menu_version_tag()])]) +m4_define([libxfce4menu_version_tag], [git]) +m4_define([libxfce4menu_version], [libxfce4menu_version_major().libxfce4menu_version_minor().libxfce4menu_version_micro()ifelse(libxfce4menu_version_nano(), [], [], [.libxfce4menu_version_nano()])ifelse(libxfce4menu_version_tag(), [git], [libxfce4menu_version_tag()-libxfce4menu_version_build()], [libxfce4menu_version_tag()])]) dnl ******************************************** dnl *** Full debug support for SVN snapshots *** dnl ******************************************** -m4_define([libxfce4menu_debug_default], [ifelse(libxfce4menu_version_tag(), [svn], [full], [minimum])]) +m4_define([libxfce4menu_debug_default], [ifelse(libxfce4menu_version_tag(), [git], [full], [minimum])]) dnl *************************** dnl *** Initialize autoconf *** diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 2ebe79f..62bfe9b 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -58,3 +58,6 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute EXTRA_DIST += \ version.xml.in + +# required for gtk-doc +dist-hook: all _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits