[nautilus-actions] run-*: update to 'target' variable

[Pierre Wieser <pwieser src gnome org>]

commit c43dc329201ffb8ac5cdc871e2e4c7a0c85564ac
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Nov 25 23:23:43 2011 +0100

    run-*: update to 'target' variable

 ChangeLog        |    6 ++++++
 run-autogen.sh   |   26 +++++++-------------------
 run-distcheck.sh |   16 +++++++++-------
 3 files changed, 22 insertions(+), 26 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 38ce314..92dd2a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-11-25 Pierre Wieser <pwieser trychlos org>
 
+	* run-autogen.sh:
+	Rename 'autogen_target' variable to 'target'.
+	Remove distcheck target as doc is enough to build manuals.
+
+	* run-distcheck.sh: Update to new 'target' variable and 'doc' target.
+
 	* docs/reference/Makefile.am:
 	gtk-doc is no more a mandatory package.
 	Requires gtk-doc 1.15 to take advantage of new source option.
diff --git a/run-autogen.sh b/run-autogen.sh
index 06ee097..bfc356d 100755
--- a/run-autogen.sh
+++ b/run-autogen.sh
@@ -1,17 +1,17 @@
 #!/bin/sh
 
-autogen_target=${autogen_target:-normal}
+target=${target:-normal}
 srcdir=$(cd ${0%/*}; pwd)
 
 # a nautilus-actions-x.y may remain after an aborted make distcheck
 # such a directory breaks gnome-autogen.sh generation
 # so clean it here
-for d in $(find . -maxdepth 1 -type d -name 'nautilus-actions-*'); do
+for d in $(find ${srcdir} -maxdepth 1 -type d -name 'nautilus-actions-*'); do
 	chmod -R u+w $d
 	rm -fr $d
 done
 
-[ "${autogen_target}" = "normal" ] &&
+[ "${target}" = "normal" ] &&
 	exec ${srcdir}/autogen.sh \
 		--prefix=$(pwd)/install \
 		--sysconfdir=/etc \
@@ -24,28 +24,16 @@ done
 		$*
 
 # 'doc' mode: enable deprecated, manuals and gtk-doc
-[ "${autogen_target}" = "doc" ] &&
+[ "${target}" = "doc" ] &&
 	exec ${srcdir}/autogen.sh \
 		--prefix=$(pwd)/install \
 		--sysconfdir=/etc \
 		--with-nautilus-extdir=$(pwd)/install/lib/nautilus \
 		--disable-schemas-install \
+		--disable-scrollkeeper \
 		--enable-deprecated \
 		--enable-gtk-doc \
-		--enable-gtk-doc-pdf \
-		--enable-html-manuals \
-		--enable-pdf-manuals \
-		$*
-
-# 'distcheck' mode: disable deprecated, enable manuals and gtk-doc
-[ "${autogen_target}" = "distcheck" ] &&
-	exec ${srcdir}/autogen.sh \
-		--prefix=$(pwd)/install \
-		--sysconfdir=/etc \
-		--with-nautilus-extdir=$(pwd)/install/lib/nautilus \
-		--disable-schemas-install \
-		--disable-deprecated \
-		--enable-gtk-doc \
+		--enable-gtk-doc-html \
 		--enable-gtk-doc-pdf \
 		--enable-html-manuals \
 		--enable-pdf-manuals \
@@ -61,7 +49,7 @@ done
 #   libnautilus-extension.pc:Requires: glib-2.0 gio-2.0 gtk+-2.0
 #   unique-1.0.pc:Requires: gtk+-2.0
 #
-[ "${autogen_target}" = "jhbuild" ] &&
+[ "${target}" = "jhbuild" ] &&
 	export autogen_prefix=${HOME}/data/jhbuild/run &&
 	PKG_CONFIG_PATH=${autogen_prefix}/lib/pkgconfig \
 	LD_LIBRARY_PATH=${autogen_prefix}/lib \
diff --git a/run-distcheck.sh b/run-distcheck.sh
index b7b4cec..8585fd3 100755
--- a/run-distcheck.sh
+++ b/run-distcheck.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
-autogen_target=distcheck ./run-autogen.sh &&
-make clean &&
-make &&
-make install &&
-./tools/check-po.sh -nodummy &&
-./tools/check-headers.sh -nodummy &&
-make distcheck
+srcdir=$(cd ${0%/*}; pwd)
+
+target=doc ${srcdir}/run-autogen.sh &&
+	make clean &&
+	make &&
+	make install &&
+	${srcdir}/tools/check-po.sh -nodummy &&
+	${srcdir}/tools/check-headers.sh -nodummy &&
+	make distcheck