Fixed build issues

3 files changed, 37 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34b473b76bde..70f82696a3f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = glrpt
 	pkgdesc = Interactive GUI application for receiving, decoding and displaying LRPT images from the Russian Meteor-M type of weather satellites
 	pkgver = 2.4.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.5b4az.org
 	arch = x86_64
 	license = GPLv3
@@ -11,6 +11,8 @@ pkgbase = glrpt
 	depends = libglade
 	depends = soapysdr
 	source = http://www.5b4az.org/pkg/lrpt/glrpt-2.4.2-beta.tar.bz2
+	source = glrpt.patch
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = glrpt
diff --git a/PKGBUILD b/PKGBUILD
index 1046a1de6663..8616d387bd83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=glrpt
 pkgver=2.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Interactive GUI application for receiving, decoding and displaying LRPT images from the Russian Meteor-M type of weather satellites"
 arch=('x86_64')
 url="http://www.5b4az.org"
@@ -12,8 +12,15 @@ depends=('rtl-sdr'
                    'libglade'
                    'soapysdr')
 makedepends=('make')
-source=("http://www.5b4az.org/pkg/lrpt/$pkgname-$pkgver-beta.tar.bz2")
-md5sums=('SKIP')
+source=("http://www.5b4az.org/pkg/lrpt/$pkgname-$pkgver-beta.tar.bz2"
+               "glrpt.patch")
+md5sums=('SKIP'
+                    'SKIP')
+
+prepare() {
+    cd "$pkgname-$pkgver-beta"
+    patch -Np0 -i $srcdir/glrpt.patch
+}
 
 build() {
 	cd "$pkgname-$pkgver-beta"
@@ -22,11 +29,6 @@ build() {
 	make
 }
 
-check() {
-	cd "$pkgname-$pkgver-beta"
-	make -k check
-}
-
 package() {
 	cd "$pkgname-$pkgver-beta"
 	make DESTDIR="$pkgdir/" install
diff --git a/glrpt.patch b/glrpt.patch
new file mode 100644
index 000000000000..e22dd22a30df
--- /dev/null
+++ b/glrpt.patch
@@ -0,0 +1,24 @@
+--- Makefile.am	2019-08-31 15:08:09.000000000 +0300
++++ Makefile.am	2019-09-15 19:14:05.427652228 +0300
+@@ -47,14 +47,15 @@
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+ 	if test -d files/; then \
+-	  install files/$(PACKAGE).desktop $(DESTDIR)/usr/share/applications/; \
+-	  install files/$(PACKAGE).svg $(DESTDIR)/usr/share/pixmaps/; \
+-	fi; \
+-	if !(test -d $(DESTDIR)/usr/share/doc/$(PACKAGE)); then \
+-	  mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \
++	  $(MKDIR_P) $(DESTDIR)$(datarootdir)/applications;\
++	  $(MKDIR_P) $(DESTDIR)$(datarootdir)/pixmaps;\
++	  $(install_sh_DATA) files/$(PACKAGE).desktop $(DESTDIR)$(datarootdir)/applications/; \
++	  $(install_sh_DATA) files/$(PACKAGE).svg $(DESTDIR)$(datarootdir)/pixmaps/; \
+ 	fi; \
+ 	if test -d doc/; then \
+-	  install doc/* $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \
+-	  install doc/$(PACKAGE).1.gz $(DESTDIR)/usr/share/man/man1/; \
++	  $(MKDIR_P) $(DESTDIR)$(docdir);\
++	  $(MKDIR_P) $(DESTDIR)$(mandir)/man1;\
++	  $(install_sh_DATA) doc/* $(DESTDIR)$(docdir)/; \
++	  $(install_sh_DATA) doc/$(PACKAGE).1.gz $(DESTDIR)$(mandir)/man1/; \
+ 	fi;