[Frugalware-git] gnometesting: move gnome_doc_split to gnome-scriptlet.sh

bouleetbil bouleetbil at frogdev.info
Tue Nov 15 00:24:40 CET 2011


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=d18340ae877d60e53cf56457735c1b315130fe89

commit d18340ae877d60e53cf56457735c1b315130fe89
Author: bouleetbil <bouleetbil at frogdev.info>
Date:   Tue Nov 15 00:07:31 2011 +0100

move gnome_doc_split to gnome-scriptlet.sh

diff --git a/source/include/gnome-scriptlet.sh b/source/include/gnome-scriptlet.sh
index 0a89d54..eec30df 100644
--- a/source/include/gnome-scriptlet.sh
+++ b/source/include/gnome-scriptlet.sh
@@ -62,7 +62,32 @@ fi
if [ -n "$_F_gnome_mime" ]; then
Fconfopts="$Fconfopts --disable-update-mimedb --enable-mime-update=no"
fi
+if [ "$_F_gnome_doc" = "y" ]; then
+	makedepends=(${makedepends[@]} 'gtk-doc')
+	subpkgs=("${subpkgs[@]}" "$pkgname-doc")
+	subdescs=("${subdescs[@]}" "$pkgname documenation")
+	subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver")
+	subdepends=("${subdepends[@]}" "gtk+3")
+	subgroups=("${subgroups[@]}" 'gnome')
+	subarchs=("${subarchs[@]}" 'i686 x86_64')
+	subreplaces=("${subreplaces[@]}" '')
+	subprovides=("${subprovides[@]}" '')

+fi
+
+#Split documentation
+_F_gnome_split_doc()
+{
+	if [ -d "$Fdestdir/usr/share/gnome/help" ]; then
+		Fsplit $pkgname-doc usr/share/gnome/help
+	fi
+	if [ -d "$Fdestdir/usr/share/gtk-doc" ]; then
+		Fsplit $pkgname-doc usr/share/gtk-doc
+	fi
+	if [ -d "$Fdestdir/usr/share/doc" ]; then
+		Fsplit $pkgname-doc usr/share/doc
+	fi
+}
###
# == OVERWRITTEN VARIABLES
# * install
@@ -141,5 +166,8 @@ build()
else
Fmakeinstall
fi
+	if [ "$_F_gnome_doc" = "y" ]; then
+		_F_gnome_split_doc
+	fi
Fbuild_gnome_scriptlet
}
diff --git a/source/include/gnome.sh b/source/include/gnome.sh
index 875f792..15621d8 100644
--- a/source/include/gnome.sh
+++ b/source/include/gnome.sh
@@ -32,7 +32,6 @@
# * _F_gnome_devel: if set, the <number>.<odd> versions will not be ignored.
# This is something you want for packages which are not part of GNOME releases
# (like intltool) and where the <odd> number does not mean instability.
-# _F_gnome_doc for create documentation packages
###

if [ -z "$_F_gnome_name" ]; then
@@ -47,33 +46,6 @@ if [ -z "$_F_gnome_git" ]; then
_F_gnome_git="n"
fi

-if [ "$_F_gnome_doc" = "y" ]; then
-	makedepends=(${makedepends[@]} 'gtk-doc')
-	subpkgs=("${subpkgs[@]}" "$pkgname-doc")
-	subdescs=("${subdescs[@]}" "$pkgname documenation")
-	subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver")
-	subdepends=("${subdepends[@]}" "gtk+3")
-	subgroups=("${subgroups[@]}" 'gnome')
-	subarchs=("${subarchs[@]}" 'i686 x86_64')
-	subreplaces=("${subreplaces[@]}" '')
-	subprovides=("${subprovides[@]}" '')
-
-fi
-
-#Split documentation
-_F_gnome_split_doc()
-{
-	if [ -d "$Fdestdir/usr/share/gnome/help" ]; then
-		Fsplit $pkgname-doc usr/share/gnome/help
-	fi
-	if [ -d "$Fdestdir/usr/share/gtk-doc" ]; then
-		Fsplit $pkgname-doc usr/share/gtk-doc
-	fi
-	if [ -d "$Fdestdir/usr/share/doc" ]; then
-		Fsplit $pkgname-doc usr/share/doc
-	fi
-}
-
# don't document this function, it's used only for source()
_F_gnome_getver()
{


More information about the Frugalware-git mailing list