From e464df4c13a696af081d2b5fac618bd02b55ed46 Mon Sep 17 00:00:00 2001 From: Mike Massonnet Date: Thu, 11 Nov 2010 08:21:45 +0100 Subject: [PATCH] Include documentation from xfce4-docs --- .gitmodules | 3 +++ Makefile.am | 1 + autogen.sh | 17 ++++------------- doc | 1 + 4 files changed, 9 insertions(+), 13 deletions(-) create mode 100644 .gitmodules create mode 160000 doc diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c036f58 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "doc"] + path = doc + url = git://git.xfce.org/xfce/xfce4-docs diff --git a/Makefile.am b/Makefile.am index 6aef17a..6ffa8d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = \ po \ + doc \ src desktopdir = $(datadir)/applications diff --git a/autogen.sh b/autogen.sh index 15c6b75..943f0cd 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,18 +10,9 @@ EOF exit 1 } -echo 'dnl *** This file is automatically generated from configure.ac.in ***' > configure.ac -echo 'dnl *** DO NOT EDIT! ***' >> configure.ac -echo >> configure.ac - -linguas=$(ls po/*.po 2>/dev/null | awk 'BEGIN {FS="[./]"; ORS=" "} {print $2}') -if [ -d .git ]; then - revision=$(git log --pretty=format:%h -n 1) -else - revision=UNKNOWN -fi -sed -e "s/@LINGUAS@/${linguas}/g" \ - -e "s/@REVISION@/${revision}/g" \ - < configure.ac.in >> configure.ac +test -z "$XDT_AUTOGEN_REQUIRED_VERSION" && \ +echo "You need to update your version of xfce4-dev-tools" && exit 2 +XDT_AUTOGEN_REQUIRED_VERSION="4.7.3" \ +XDT_AUTOGEN_CHECK_DOCS="doc" \ exec xdt-autogen $@ diff --git a/doc b/doc new file mode 160000 index 0000000..204be31 --- /dev/null +++ b/doc @@ -0,0 +1 @@ +Subproject commit 204be31d03158fa84cb5dc4b3a7f0781fe56091e