buildsystem: clean up and cosmetics

This commit is contained in:
Stefan Saraev
2013-12-13 14:07:31 +02:00
parent 315bfbe49b
commit debacf21ae
4 changed files with 23 additions and 88 deletions

View File

@@ -114,21 +114,6 @@ if [ -f $PKG_DIR/package.mk ]; then
# include buildfile
. $PKG_DIR/package.mk
# set PKG_BUILD variable
if [ -z "$PKG_BUILD" ]; then
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}"
fi
fi
# install
if [ "$(type -t pre_install)" = "function" ]; then
pre_install
@@ -141,17 +126,6 @@ if [ -f $PKG_DIR/package.mk ]; then
post_install
fi
elif [ -f $PKG_DIR/install ]; then
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}"
fi
$PKG_DIR/install $@ >&$VERBOSE_OUT
fi