From 72f5074e998bb0e20e6befe4bc66aa4fc89e9c79 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Mon, 28 Mar 2011 00:30:43 +0000 Subject: [PATCH] finddir invocation cleanups. Changed --docdir to $COMMON_DOCS/doc/ --- dev-libs/libiconv/libiconv-1.13.1.bep | 13 +++++++------ dev-libs/libpcre/libpcre-8.12.bep | 5 +++-- media-libs/ftgl/ftgl-2.1.3.bep | 7 ++++--- sys-devel/automake/automake-1.11.1.bep | 14 ++++++++------ 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dev-libs/libiconv/libiconv-1.13.1.bep b/dev-libs/libiconv/libiconv-1.13.1.bep index c6428e870..f8f9f0112 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.bep +++ b/dev-libs/libiconv/libiconv-1.13.1.bep @@ -1,5 +1,5 @@ -DESCRIPTION="libiconv" -HOMEPAGE="http://www.gnu.org/software/libiconv/" +DESCRIPTION="libiconv" +HOMEPAGE="http://www.gnu.org/software/libiconv/" SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz" CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a" REVISION="1" @@ -14,7 +14,7 @@ BUILD { cp `aclocal --print-ac-dir`/ltsugar.m4 m4 cp `aclocal --print-ac-dir`/lt~obsolete.m4 m4 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" - libtoolize -fci + libtoolize -fci aclocal -I m4 -I srcm4 autoconf autoheader @@ -26,14 +26,15 @@ BUILD { cp `aclocal --print-ac-dir`/lt~obsolete.m4 m4 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" libtoolize -fci - aclocal -I m4 + aclocal -I m4 autoconf autoheader cd .. + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --docdir=$COMMON_DOCS/doc/iconv \ + --mandir=$COMMON_DOCS/man \ --enable-relocatable \ --enable-shared \ --enable-static diff --git a/dev-libs/libpcre/libpcre-8.12.bep b/dev-libs/libpcre/libpcre-8.12.bep index 324e4999b..1d1b9188d 100644 --- a/dev-libs/libpcre/libpcre-8.12.bep +++ b/dev-libs/libpcre/libpcre-8.12.bep @@ -12,13 +12,14 @@ BUILD { aclocal autoconf automake + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --enable-utf8 \ --enable-unicode-properties \ --with-pic \ --libdir=${LIBDIR} \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc + --mandir=$COMMON_DOCS/man \ + --docdir=$COMMON_DOCS/doc/pcre make } diff --git a/media-libs/ftgl/ftgl-2.1.3.bep b/media-libs/ftgl/ftgl-2.1.3.bep index 63ada9a8f..c7298666d 100644 --- a/media-libs/ftgl/ftgl-2.1.3.bep +++ b/media-libs/ftgl/ftgl-2.1.3.bep @@ -1,5 +1,5 @@ -DESCRIPTION="FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to simplify rendering fonts in OpenGL applications" -HOMEPAGE="http://sourceforge.net/projects/ftgl" +DESCRIPTION="FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to simplify rendering fonts in OpenGL applications" +HOMEPAGE="http://sourceforge.net/projects/ftgl" SRC_URI="http://downloads.sourceforge.net/project/ftgl/FTGL%20Source/2.1.3%7Erc5/ftgl-2.1.3-rc5.tar.gz" CHECKSUM_MD5="fcf4d0567b7de9875d4e99a9f7423633" REVISION="3" @@ -17,8 +17,9 @@ BUILD { libtoolize --copy --force --install aclocal -I m4 ./autogen.sh + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc + --datarootdir=$COMMON_DOCS/doc/ftgl make } diff --git a/sys-devel/automake/automake-1.11.1.bep b/sys-devel/automake/automake-1.11.1.bep index b35c604d2..b809f2126 100644 --- a/sys-devel/automake/automake-1.11.1.bep +++ b/sys-devel/automake/automake-1.11.1.bep @@ -1,5 +1,5 @@ -DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" -HOMEPAGE="http://www.gnu.org/software/automake/" +DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" +HOMEPAGE="http://www.gnu.org/software/automake/" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz" CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74" REVISION="1" @@ -7,11 +7,13 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd automake-1.11.1 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + --datadir=$COMMON_DATA \ + --docdir=$COMMON_DOCS/doc/automake \ + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man make }