Fix PKGBUILDS (#452)

12 files changed, 12 insertions, 84 deletions

diff --git a/pkgbuilds/PKGBUILD-arm64 b/pkgbuilds/PKGBUILD-arm64
index f0539cc9..ad1c02ea 100644
--- a/pkgbuilds/PKGBUILD-arm64
+++ b/pkgbuilds/PKGBUILD-arm64
@@ -23,7 +23,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-arm64-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-		cmake .. -DARM_DYNAREC=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
+		cmake .. -DARM_DYNAREC=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -35,10 +35,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-arm64-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }
diff --git a/pkgbuilds/PKGBUILD-arm64-DEBUG b/pkgbuilds/PKGBUILD-arm64-DEBUG
index dae97993..1b5f70fe 100644
--- a/pkgbuilds/PKGBUILD-arm64-DEBUG
+++ b/pkgbuilds/PKGBUILD-arm64-DEBUG
@@ -23,7 +23,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-arm64-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-		cmake .. -DARM_DYNAREC=ON -DCMAKE_BUILD_TYPE=Debug
+		cmake .. -DARM_DYNAREC=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -35,10 +35,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-arm64-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }
diff --git a/pkgbuilds/PKGBUILD-lx2160a b/pkgbuilds/PKGBUILD-lx2160a
index 0e7bfde0..f9b14851 100644
--- a/pkgbuilds/PKGBUILD-lx2160a
+++ b/pkgbuilds/PKGBUILD-lx2160a
@@ -23,7 +23,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-lx2160a-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-		cmake .. -DLX2160A=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+		cmake .. -DLX2160A=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -35,10 +35,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-lx2160a-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }
diff --git a/pkgbuilds/PKGBUILD-lx2160a-DEBUG b/pkgbuilds/PKGBUILD-lx2160a-DEBUG
index b6e19a95..082fd74e 100644
--- a/pkgbuilds/PKGBUILD-lx2160a-DEBUG
+++ b/pkgbuilds/PKGBUILD-lx2160a-DEBUG
@@ -23,7 +23,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-lx2160a-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-		cmake .. -DLX2160A=1 -DCMAKE_BUILD_TYPE=Debug
+		cmake .. -DLX2160A=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -35,10 +35,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-lx2160a-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }
diff --git a/pkgbuilds/PKGBUILD-rk3399 b/pkgbuilds/PKGBUILD-rk3399
index 4bb53dfd..0c3db917 100644
--- a/pkgbuilds/PKGBUILD-rk3399
+++ b/pkgbuilds/PKGBUILD-rk3399
@@ -23,7 +23,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-rk3399-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-                cmake .. -DRK3399=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+                cmake .. -DRK3399=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -35,10 +35,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-rk3399-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }
diff --git a/pkgbuilds/PKGBUILD-rk3399-DEBUG b/pkgbuilds/PKGBUILD-rk3399-DEBUG
index f94dcc50..e39da09a 100644
--- a/pkgbuilds/PKGBUILD-rk3399-DEBUG
+++ b/pkgbuilds/PKGBUILD-rk3399-DEBUG
@@ -23,7 +23,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-rk3399-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-                cmake .. -DRK3399=1 -DCMAKE_BUILD_TYPE=Debug
+                cmake .. -DRK3399=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -35,10 +35,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-rk3399-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }
diff --git a/pkgbuilds/PKGBUILD-rpi4 b/pkgbuilds/PKGBUILD-rpi4
index c34f0e54..32a030d5 100644
--- a/pkgbuilds/PKGBUILD-rpi4
+++ b/pkgbuilds/PKGBUILD-rpi4
@@ -23,7 +23,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-rpi-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-		cmake .. -DRPI4ARM64=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+		cmake .. -DRPI4ARM64=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -35,10 +35,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-rpi-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }
diff --git a/pkgbuilds/PKGBUILD-rpi4-DEBUG b/pkgbuilds/PKGBUILD-rpi4-DEBUG
index 831b7c38..ac192b1d 100644
--- a/pkgbuilds/PKGBUILD-rpi4-DEBUG
+++ b/pkgbuilds/PKGBUILD-rpi4-DEBUG
@@ -23,7 +23,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-rpi-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-		cmake .. -DRPI4ARM64=1 -DCMAKE_BUILD_TYPE=Debug
+		cmake .. -DRPI4ARM64=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -35,10 +35,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-rpi-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }
diff --git a/pkgbuilds/PKGBUILD-tegra b/pkgbuilds/PKGBUILD-tegra
index 192770d1..cf4a0001 100644
--- a/pkgbuilds/PKGBUILD-tegra
+++ b/pkgbuilds/PKGBUILD-tegra
@@ -23,7 +23,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-tegra-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-		cmake .. -DTEGRAX1=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+		cmake .. -DTEGRAX1=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -35,10 +35,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-tegra-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }
diff --git a/pkgbuilds/PKGBUILD-tegra-DEBUG b/pkgbuilds/PKGBUILD-tegra-DEBUG
index 3db2ca60..f27b968c 100644
--- a/pkgbuilds/PKGBUILD-tegra-DEBUG
+++ b/pkgbuilds/PKGBUILD-tegra-DEBUG
@@ -23,7 +23,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-tegra-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-		cmake .. -DTEGRAX1=1 -DCMAKE_BUILD_TYPE=Debug
+		cmake .. -DTEGRAX1=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -35,10 +35,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-tegra-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }
diff --git a/pkgbuilds/PKGBUILD-x86_64 b/pkgbuilds/PKGBUILD-x86_64
index 22dae679..17240e02 100644
--- a/pkgbuilds/PKGBUILD-x86_64
+++ b/pkgbuilds/PKGBUILD-x86_64
@@ -22,7 +22,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-x64-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-		cmake .. -DLD80BITS=1 -DNOALIGN=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+		cmake .. -DLD80BITS=1 -DNOALIGN=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -34,10 +34,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-x64-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }
diff --git a/pkgbuilds/PKGBUILD-x86_64-DEBUG b/pkgbuilds/PKGBUILD-x86_64-DEBUG
index a83a3ab9..770b7d2b 100644
--- a/pkgbuilds/PKGBUILD-x86_64-DEBUG
+++ b/pkgbuilds/PKGBUILD-x86_64-DEBUG
@@ -22,7 +22,7 @@ prepare() {
 	cd "${srcdir}/${pkgname%-x64-git}"
 	if [[ ! -d ./build ]]; then
 		mkdir build && cd build
-		cmake .. -DLD80BITS=1 -DNOALIGN=1 -DCMAKE_BUILD_TYPE=Debug
+		cmake .. -DLD80BITS=1 -DNOALIGN=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr
 	fi
 }
 
@@ -34,10 +34,4 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-x64-git}/build"
 	make DESTDIR="${pkgdir}/" install
-	# /usr/local/bin isn't in PATH by the default,
-	# we should move it to /usr/bin
-	cd ${pkgdir}
-	mv usr/local/bin/ usr/bin/
-	# cleanup when dir is empty
-	rmdir usr/local || exit 0
 }