Updating branch refs/heads/master
to cd1159f3d117a1191a8426e7ed3a8f3493cad972 (commit)
from 09b74380f69f430da11f48355e06378bffe8b628 (commit)
commit cd1159f3d117a1191a8426e7ed3a8f3493cad972
Author: Jannis Pohlmann <jan...@xfce.org>
Date: Thu Sep 17 02:58:27 2009 +0200
Fix docs for make distcheck. Update to xfce4-dev-tools 4.7.0.
autogen.sh | 28 ++--------------------------
configure.in.in | 2 +-
docs/Makefile.am | 11 ++++++++++-
3 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index a2febe3..c4e0651 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id$
+# vi:set et ai sw=2 sts=2 ts=2: */
#
# Copyright (c) 2002-2006
# The Xfce development team. All rights reserved.
@@ -18,28 +18,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 [ -d .git ]; then
- revision=$(git rev-parse --short HEAD)
-fi
-if [ -z "$revision" ]; then
- revision=UNKNOWN
-fi
-
-sed -e "s/@LINGUAS@/${linguas}/g" \
- -e "s/@REVISION@/${revision}/g" \
- < "configure.in.in" > "configure.in"
-
-exec xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index 0c4816b..983ff87 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -25,7 +25,7 @@ dnl # YOU ARE DOING.
dnl *******************************************
dnl *** Debugging support for SVN snapshots ***
dnl *******************************************
-m4_define([libxfcegui4_debug_default], [ifelse(libxfcegui4_version_tag(),
[svn], [yes], [minimum])])
+m4_define([libxfcegui4_debug_default], [ifelse(libxfcegui4_version_tag(),
[git], [yes], [minimum])])
dnl ***************************
dnl *** Initialize autoconf ***
diff --git a/docs/Makefile.am b/docs/Makefile.am
index d1e1e19..4046464 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,4 +1,6 @@
-## Process this file with automake to produce Makefile.in
+# Process this file with automake to produce Makefile.in
+#
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
AUTOMAKE_OPTIONS = 1.6
@@ -57,3 +59,10 @@ include $(top_srcdir)/gtk-doc.make
EXTRA_DIST += \
version.xml.in
+if MAINTAINER_MODE
+%.1: %.xml
+ xsltproc -nonet
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+endif
+
+# required for gtk-doc
+dist-hook: all
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
