mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
ncmpcpp: use commandBinDir, add commandSuffix.
commandBinDir was defined but never used, so pass it to configure.
This commit is contained in:
@@ -7,7 +7,7 @@ NCMPCPP is an ncurses based commandline client for Music Player Daemon."
|
||||
HOMEPAGE="https://rybczak.net/ncmpcpp/"
|
||||
COPYRIGHT="2008-2018 The NCMPCPP Project"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://github.com/arybczak/ncmpcpp/archive/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="682fa230029a917f8c8b54131e6c8fb4915aefed2cc5726ca7c3ab4f4fb97bda"
|
||||
SOURCE_DIR="ncmpcpp-$portVersion"
|
||||
@@ -15,15 +15,16 @@ SOURCE_DIR="ncmpcpp-$portVersion"
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
if [ "$targetArchitecture" != x86_gcc2 ]; then
|
||||
commandBinDir=$binDir
|
||||
else
|
||||
commandSuffix=$secondaryArchSuffix
|
||||
commandBinDir=$binDir
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandSuffix=
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
|
||||
PROVIDES="
|
||||
ncmpcpp$secondaryArchSuffix = $portVersion
|
||||
cmd:ncmpcpp
|
||||
cmd:ncmpcpp$commandSuffix
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -81,7 +82,7 @@ USER_SETTINGS_FILES="
|
||||
"
|
||||
|
||||
defineDebugInfoPackage ncmpcpp$secondaryArchSuffix \
|
||||
"$binDir"/ncmpcpp
|
||||
"$commandBinDir"/ncmpcpp
|
||||
|
||||
BUILD()
|
||||
{
|
||||
@@ -90,7 +91,7 @@ BUILD()
|
||||
|
||||
autoreconf -vfi
|
||||
|
||||
runConfigure ./configure \
|
||||
runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
|
||||
--enable-outputs \
|
||||
--enable-visualizer \
|
||||
--enable-clock
|
||||
|
||||
Reference in New Issue
Block a user