[arch-commits] Commit in sdlmame/trunk (PKGBUILD extras.tar.gz sdlmame.sh)

[Antonio Rojas]

    Date: Wednesday, March 21, 2018 @ 17:31:35
  Author: arojas
Revision: 310039

Package all binaries (FS#57892), don't install binaries to /usr/share

Modified:
  sdlmame/trunk/PKGBUILD
  sdlmame/trunk/sdlmame.sh
Deleted:
  sdlmame/trunk/extras.tar.gz

------------+
 PKGBUILD   |   23 ++++++-----------------
 sdlmame.sh |    6 +++---
 2 files changed, 9 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-21 16:58:33 UTC (rev 310038)
+++ PKGBUILD	2018-03-21 17:31:35 UTC (rev 310039)
@@ -15,7 +15,7 @@
 makedepends=(nasm mesa python2 libxinerama)
 source=("https://github.com/mamedev/mame/archive/mame${pkgver/./}.tar.gz" sdlmame.sh)
 sha256sums=('b18d0e23ecf6b218c43a6770213c850b3c605ead9d29301de34101ed14c28a57'
-            '06e7f5dca2255a16b3336a6d2b9af8276a8d8c672635aed83e9e8f636db3cef7')
+            'cecb5c7561f44d9b9721336d3af206a2c7e365840f1d09416e07cda9da1cda82')
 
 build() {
   cd mame-mame${pkgver/./}
@@ -33,22 +33,11 @@
   # Install the sdlmame script
   install -Dm755 "$srcdir"/$pkgname.sh "$pkgdir"/usr/bin/$pkgname
 
-  # Install the applications and the UI font in /usr/share
-  install -Dm755 mame64 "$pkgdir"/usr/lib/$pkgname/$pkgname
-
-  install -m755 chdman "$pkgdir"/usr/lib/$pkgname/chdman
-  install -m755 jedutil "$pkgdir"/usr/lib/$pkgname/jedutil
-  install -m755 regrep "$pkgdir"/usr/lib/$pkgname/regrep
-  install -m755 romcmp "$pkgdir"/usr/lib/$pkgname/romcmp
-  install -m755 src2html "$pkgdir"/usr/lib/$pkgname/src2html
-  install -m755 srcclean "$pkgdir"/usr/lib/$pkgname/srcclean
-  install -m755 ldverify "$pkgdir"/usr/lib/$pkgname/ldverify
-  install -m755 ldresample "$pkgdir"/usr/lib/$pkgname/ldresample
-
-  # ln binaries
-  install -dm755 "$pkgdir"/usr/share/$pkgname
-  for i in $pkgname chdman jedutil regrep romcmp src2html srcclean ldverify ldresample; do
-    ln -s /usr/lib/$pkgname/$i "$pkgdir"/usr/share/$pkgname/$i
+  # Install the binaries
+  install -Dm755 mame64 "$pkgdir"/usr/lib/sdlmame/sdlmame
+  for _i in castool chdman imgtool jedutil nltool nlwav pngcmp regrep romcmp src2html \
+            split srcclean ldverify ldresample; do
+    install -m755 $_i -t "$pkgdir"/usr/lib/sdlmame
   done
 
   # Install the extra bits

Deleted: extras.tar.gz
===================================================================
(Binary files differ)

Modified: sdlmame.sh
===================================================================
--- sdlmame.sh	2018-03-21 16:58:33 UTC (rev 310038)
+++ sdlmame.sh	2018-03-21 17:31:35 UTC (rev 310039)
@@ -12,7 +12,7 @@
     echo "Your old ini file has been renamed to mameini.bak"
     mv mame.ini mameini.bak
   fi
-  /usr/share/sdlmame/sdlmame \
+  /usr/lib/sdlmame/sdlmame \
     -artpath "$home/.mame/artwork;artwork" \
     -ctrlrpath "$home/.mame/ctrlr;ctrlr" \
     -inipath $home/.mame/ini \
@@ -35,7 +35,7 @@
   mkdir $HOME/.mame
   mkdir $HOME/.mame/{artwork,cfg,comments,ctrlr,diff,ini,inp,nvram,samples,snap,sta,roms}
   cd $HOME/.mame
-  /usr/share/sdlmame/sdlmame \
+  /usr/lib/sdlmame/sdlmame \
     -artpath "$home/.mame/artwork;artwork" \
     -ctrlrpath "$home/.mame/ctrlr;ctrlr" \
     -inipath $home/.mame/ini \
@@ -51,6 +51,6 @@
     -video opengl \
     -createconfig
 else
-  cd /usr/share/sdlmame
+  cd /usr/lib/sdlmame
   ./sdlmame "$@"
 fi