openjpeg: clean up

media-libs/openjpeg/openjpeg-2.4.0.recipe

@@ -19,12 +19,12 @@ Universite catholique de Louvain (UCL), Belgium
 	2011-2012, Centre National d'Etudes Spatiales (CNES), France
 	2012, CS Systemes d'Information, France"
 LICENSE="BSD (2-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/uclouvain/openjpeg/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d"
 SOURCE_FILENAME="openjpeg-$portVersion.tar.gz"
 
-ARCHITECTURES="all !x86_gcc2 ?x86"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -65,10 +65,8 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mkdir -p build
-	cd build
-	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix \
-		-DCMAKE_BUILD_TYPE=Release \
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=$prefix \
 		-DOPENJPEG_INSTALL_BIN_DIR=$relativeBinDir \
 		-DOPENJPEG_INSTALL_LIB_DIR=$relativeDevelopLibDir \
 		-DOPENJPEG_INSTALL_INCLUDE_DIR=$relativeIncludeDir \
@@ -76,13 +74,12 @@ BUILD()
 		-DBUILD_SHARED_LIBS=ON \
 		-DBUILD_STATIC_LIBS=OFF \
 		-DBUILD_TESTING:BOOL=ON
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
 
 	mkdir -p $(dirname $libDir)
 	mv $developLibDir $libDir
@@ -102,6 +99,5 @@ INSTALL()
 
 TEST()
 {
-	cd build
-	make test
+	make -C build test
 }