optimized ArchLinux and MSYS2 installation procedure

utat-ss · Aug 25, 2023 · d67903e · d67903e
1 parent 6713c74
commit d67903e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -36,14 +36,12 @@ sudo rpm -i *.rmp
 ### ArchLinux
 
 ```
-cpack -G TGZ
 makepkg -si
 ```
 
 ### MSYS2 (Windows)
 
 ```
-cpack -G TGZ
 makepkg-mingw -si
 ```
 

diff --git a/cmake/PKGBUILD-Archlinux.in b/cmake/PKGBUILD-Archlinux.in
@@ -7,15 +7,15 @@ pkgdesc="@PROJECT_DESCRIPTION@"
 arch=('any')
 license=('GPL')
 depends=('gnuradio' 'libsndfile')
-source=("$pkgname-$pkgver.tar.gz")
-md5sums=('SKIP')
+source=()
+md5sums=()
 url="https://github.com/utat-ss/HERON-gr-utat"
 build(){
-  cd "$srcdir"
+  cd ..
+  cmake .. -DCMAKE_INSTALL_PREFIX="/usr"
+  cmake --build .
 }
 package() {
-  cd "$srcdir"
-  tar -xf "$pkgname-$pkgver.tar.gz" -C "$pkgdir"
-  cd "$pkgdir"
-  mv "$pkgname-$pkgver" "usr"
+  cd ..
+  DESTDIR="$pkgdir" cmake --install .
 }
diff --git a/cmake/PKGBUILD-MSYS2.in b/cmake/PKGBUILD-MSYS2.in
@@ -15,11 +15,12 @@ source=("$_realname-$pkgver.tar.gz")
 md5sums=('SKIP')
 url="https://github.com/utat-ss/HERON-gr-utat"
 build(){
-  cd "$srcdir"
+  cd ..
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+  cmake .. -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX}
+  cmake --build .
 }
 package() {
-  cd "$srcdir"
-  tar -xf "$_realname-$pkgver.tar.gz" -C "$pkgdir"
-  cd "$pkgdir"
-  mv "$_realname-$pkgver" "./${MINGW_PREFIX}"
+  cd ..
+  DESTDIR="$pkgdir" cmake --install .
 }