More cleanups relating to finddir invocations. No functional changes.

This commit is contained in:
Matt Madia
2011-03-27 23:52:58 +00:00
parent 35054e66cc
commit fd4d6ee934
7 changed files with 29 additions and 20 deletions

View File

@@ -13,7 +13,11 @@ BUILD {
INSTALL {
cd p7zip_9.04
make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` DEST_SHARE_DOC=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/p7zip DEST_MAN=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
make install DEST_DIR=${DESTDIR} \
DEST_HOME=`finddir B_COMMON_DIRECTORY` \
DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \
DEST_MAN=$COMMON_DOCS/man
}
LICENSE="GNU LGPL v2.1"
COPYRIGHT="1999-2009 7-Zip Igor Pavlov."

View File

@@ -13,9 +13,10 @@ BUILD {
INSTALL {
cd p7zip_9.13
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \
DEST_SHARE_DOC=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/p7zip \
DEST_MAN=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \
DEST_MAN=$COMMON_DOCS/man
}
LICENSE="GNU LGPL v2.1"
COPYRIGHT="1999-2010 7-Zip Igor Pavlov."

View File

@@ -1,5 +1,5 @@
DESCRIPTION="Yasm assembler"
HOMEPAGE="http://www.tortall.net/projects/yasm/"
DESCRIPTION="Yasm assembler"
HOMEPAGE="http://www.tortall.net/projects/yasm/"
SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz"
CHECKSUM_MD5="8392e5f2235c2c2a981e1a633f2698cb"
REVISION="1"
@@ -8,8 +8,9 @@ DEPEND=""
BUILD {
cd yasm-1.1.0
libtoolize --force --copy --install
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
--mandir=$COMMON_DOCS/man
make
}

View File

@@ -18,11 +18,11 @@ BUILD {
aclocal -I m4
automake
autoconf
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \
--mandir=$MANDIR
--mandir=$COMMON_DOCS
make
}

View File

@@ -9,11 +9,11 @@ DEPEND=""
BUILD {
cd libevent-1.4.14b-stable
autoreconf -vfi
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \
--mandir=$MANDIR
--mandir=$COMMON_DOCS
make
}

View File

@@ -9,11 +9,11 @@ DEPEND=""
BUILD {
cd libevent-2.0.10-stable
autoreconf -vfi
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \
--mandir=$MANDIR
--mandir=$COMMON_DOCS
make
}

View File

@@ -1,6 +1,6 @@
DESCRIPTION="Bazaar"
HOMEPAGE="https://launchpad.net/bzr/"
SRC_URI="http://launchpad.net/bzr/2.2/2.2.0/+download/bzr-2.2.0.tar.gz"
DESCRIPTION="Bazaar"
HOMEPAGE="https://launchpad.net/bzr/"
SRC_URI="http://launchpad.net/bzr/2.2/2.2.0/+download/bzr-2.2.0.tar.gz"
CHECKSUM_MD5="e47fa50e1fedc01c4761925e9d0d39ac"
REVISION="1"
STATUS_HAIKU="stable"
@@ -17,16 +17,19 @@ BUILD {
INSTALL {
cd bzr-2.2.0
COMMON_DIR=`finddir B_COMMON_DIRECTORY`
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
if [ -n "$(setgcc | grep '2')" ]; then
python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR}
python setup.py build_ext --allow-python-fallback install --prefix=$COMMON_DIR --root=${DESTDIR}
else
python setup.py install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR}
python setup.py install --prefix=$COMMON_DIR --root=${DESTDIR}
fi
## Now put the man file(s) in the correct directory
mkdir -p ${DESTDIR}$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1
mv ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man/man1/bzr* ${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1/
mkdir -p ${DESTDIR}$COMMON_DOCS/man/man1
mv ${DESTDIR}/$COMMON_DIR/man/man1/bzr* ${DESTDIR}/$COMMON_DOCS/man/man1/
if [ -e "${DESTDIR}" ]; then
rm -rf ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man
rm -rf ${DESTDIR}/$COMMON_DIR/man
fi
}