summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/autogen.sh.example28
-rw-r--r--doc/usage.txt23
2 files changed, 14 insertions, 37 deletions
diff --git a/doc/autogen.sh.example b/doc/autogen.sh.example
index 8f50492..1114c76 100644
--- a/doc/autogen.sh.example
+++ b/doc/autogen.sh.example
@@ -1,27 +1,19 @@
#!/bin/sh
-srcdir=`basename $0`
+
+srcdir=`dirname $0`
[ -z "$srcdir" ] && srcdir=.
PKG_NAME=mate-package
-REQUIRED_AUTOMAKE_VERSION=1.7
-if [ ! -f "$srcdir/somefile-that-is-only-in-mate-package" ]; then
-echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2
-exit 1
+if [ ! -f "$srcdir/configure.ac" ]; then
+ echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2
+ exit 1
fi
-. mate-autogen
+which mate-autogen.sh || {
+ echo "You need to install mate-common"
+ exit 1
+}
+. mate-autogen
-# Then put the following in your configure.ac or configure.in file:
-# MATE_COMMON_INIT
-#
-# This macro is equivalent to the following two lines (which you can use
-# instead if you don't want to depend on mate-common macros):
-# AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
-#
-# Or if you are using the AC_CONFIG_MACRO_DIR macro:
-# AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \${ACLOCAL_FLAGS}"])
-#
-# This will make sure that autoconf macros will be found when you
-# rebuild the package without rerunning autogen.sh.
diff --git a/doc/usage.txt b/doc/usage.txt
index f591662..cdadc19 100644
--- a/doc/usage.txt
+++ b/doc/usage.txt
@@ -1,29 +1,14 @@
This module contains various files needed to bootstrap MATE modules
-built from GIT. It contains the following components:
+built from git. It contains the following components:
1. A common "autogen.sh" script that can be used to configure a
- source directory checked out from GIT.
+ source directory checked out from git.
2. Some commonly used macros (quite a small set these days -- macros
should be packaged with their respective modules).
3. Some files used to build user documentation.
To make use of the common autogen script, create a stub autogen.sh
-script in your module that looks something like this:
-
----- Cut Here ----
-#!/bin/sh
-srcdir=`basename $0`
-[ -z "$srcdir" ] && srcdir=.
-
-PKG_NAME=mypackage
-REQUIRED_AUTOMAKE_VERSION=1.7
-
-if [ ! -f "$srcdir/somefile-that-is-only-in-mypackage" ]; then
- echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2
- exit 1
-fi
-
-. mate-autogen
----- Cut Here ----
+script in your module. See the example script in autogen.sh.example
+file in mate-common documentation folder.
Then put the following in your configure.ac or configure.in file:
MATE_COMMON_INIT