Move binary from /usr/share to /usr/lib

3 files changed, 26 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 087456769cdc..0061a9fe3a0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = goonies
 	pkgdesc = Unofficial remake of Konami's The Goonies for the MSX
 	pkgver = 1.4.1528
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.braingames.getput.com/goonies
 	arch = i686
 	arch = x86_64
@@ -12,7 +12,7 @@ pkgbase = goonies
 	source = http://braingames.jorito.net/goonies/downloads/goonies.src_1.4.1528.tgz
 	source = goonies.patch
 	sha1sums = a2be53b74e9744ca72fdd1913f2dab1912170534
-	sha1sums = 780e4bacf811b63431718f24e33e799f017bf726
+	sha1sums = 931f5b2effc39324d60c5ea3d344b21ceaad7fcf
 
 pkgname = goonies
 
diff --git a/PKGBUILD b/PKGBUILD
index 9557c7a412af..cb5e5a20b616 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Michael Straube <michael_straube web de>
+# Maintainer: Michael Straube <straubem@gmx.de>
 
 pkgname=goonies
 pkgver=1.4.1528
-pkgrel=1
+pkgrel=2
 pkgdesc="Unofficial remake of Konami's The Goonies for the MSX"
 arch=('i686' 'x86_64')
 license=('unknown')
@@ -11,13 +11,13 @@ depends=('sdl_image' 'sdl_mixer' 'glu')
 source=("http://braingames.jorito.net/goonies/downloads/$pkgname.src_$pkgver.tgz"
         goonies.patch)
 sha1sums=('a2be53b74e9744ca72fdd1913f2dab1912170534'
-          '780e4bacf811b63431718f24e33e799f017bf726')
+          '931f5b2effc39324d60c5ea3d344b21ceaad7fcf')
 
 prepare() {
   cd $pkgname-$pkgver
 
   # fix compile errors and bin path
-  patch -p0 < "$srcdir/goonies.patch"
+  patch -p0 < ../goonies.patch
 }
 
 build() {
@@ -29,5 +29,5 @@ build() {
 package() {
   cd $pkgname-$pkgver
 
-  make PREFIX="$pkgdir/usr" install
+  make PREFIX="$pkgdir"/usr install
 }
diff --git a/goonies.patch b/goonies.patch
index 79eec750a043..4a8d24466689 100644
--- a/goonies.patch
+++ b/goonies.patch
@@ -1,14 +1,17 @@
---- build/linux/Makefile 2016-06-07 16:59:56.225909535 +0200
-+++ build/linux/Makefile 2016-06-07 17:05:44.756102836 +0200
-@@ -3,7 +3,7 @@
+--- build/linux/Makefile 2009-03-12 11:05:30.000000000 +0100
++++ build/linux/Makefile 2016-12-04 15:27:46.029273929 +0100
+@@ -3,9 +3,9 @@
  PREFIX = /usr
  EXTRADIR = ./build/linux
  
 -GAMEDIR = $(PREFIX)/games
 +GAMEDIR = $(PREFIX)/bin
  STARTUP = $(GAMEDIR)/$(EXE)
- BINDIR = $(PREFIX)/share/games/$(EXE)
+-BINDIR = $(PREFIX)/share/games/$(EXE)
++BINDIR = $(PREFIX)/share/$(EXE)
  ICNDIR = $(PREFIX)/share/pixmaps
+ APPDIR = $(PREFIX)/share/applications
+ 
 @@ -56,7 +56,7 @@
  	$(SRC)/Symbol.o			$(SRC)/TheGooniesApp.o \
  	$(SRC)/TheGoonies.o		$(SRC)/Vector.o
@@ -18,12 +21,22 @@
  CFLAGS = -g3 -O3 -Wno-write-strings `sdl-config --cflags` -I/usr/X11R6/include
  LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lGL -lGLU
  RM = rm -f
-@@ -88,7 +88,8 @@
+@@ -83,12 +83,16 @@
+ install: all
+ 	@$(ECHO) " o Creating install directory $(BINDIR)"
+ 	@$(MD) "$(BINDIR)"
+-	@$(ECHO) " o Installing game and data to $(BINDIR)"
+-	@$(CP) "$(EXE)" $(DATA) "$(BINDIR)"
++	@$(ECHO) " o Installing data to $(BINDIR)"
++	@$(CP) $(DATA) "$(BINDIR)"
++	@$(ECHO) " o Installing binary to $(PREFIX)/lib/$(EXE)"
++	@$(MD) "$(PREFIX)/lib/$(EXE)"
++	@$(CP) "$(EXE)" "$(PREFIX)/lib/$(EXE)"
  	@$(ECHO) " o Creating startup script $(STARTUP)"
  	@$(MD) "$(GAMEDIR)"
  	@$(ECHO) "#!/bin/sh" >"$(STARTUP)"
 -	@$(ECHO) "cd \"$(BINDIR)\" && ./$(EXE)" >>"$(STARTUP)"
-+	@$(ECHO) "cd \"/usr/share/games/goonies/\" && ./$(EXE)" >>"$(STARTUP)"
++	@$(ECHO) "cd \"/usr/share/goonies/\" && /lib/$(EXE)/$(EXE)" >>"$(STARTUP)"
 +#	@$(ECHO) "cd \"$(BINDIR)\" && ./$(EXE)" >>"$(STARTUP)"
  	@$(CHMOD) 755 "$(STARTUP)"
  	@$(ECHO) " o Creating application menu entry"