Add patch for Makefle not respecting DESTDIR

3 files changed, 45 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b86c6a6054d6..be5b2296cdec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = seq66-git
 	pkgdesc = A live-looping sequencer with an Qt graphical interface (git version)
-	pkgver = 0.91.3.r319.1f92b17
+	pkgver = 0.98.3.r773.0e0722f6
 	pkgrel = 1
 	url = https://github.com/ahlstromcj/seq66
 	arch = i686
@@ -13,14 +13,15 @@ pkgbase = seq66-git
 	makedepends = liblo
 	depends = qt5-base
 	provides = seq66
-	provides = seq66=0.91.3
+	provides = seq66=0.98.3
 	conflicts = seq66
 	source = seq66::git+https://github.com/ahlstromcj/seq66.git
+	source = seq66-destdir.patch
 	md5sums = SKIP
+	md5sums = b0acb87040cef1ff9ddaff9154be6632
 
 pkgname = seq66-git
 	depends = qt5-base
 	depends = libasound.so
 	depends = libjack.so
 	depends = liblo.so
-
diff --git a/PKGBUILD b/PKGBUILD
index 77daff8fb645..9c32bd55810a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=seq66
 pkgname="${_pkgname}-git"
-pkgver=0.91.3.r319.1f92b17
+pkgver=0.98.3.r773.0e0722f6
 pkgrel=1
 pkgdesc="A live-looping sequencer with an Qt graphical interface (git version)"
 arch=('i686' 'x86_64')
@@ -13,8 +13,10 @@ makedepends=('git' 'alsa-lib' 'jack' 'liblo')
 groups=('pro-audio')
 provides=("${_pkgname}" "${_pkgname}=${pkgver//.r*/}")
 conflicts=("${_pkgname}")
-source=("${_pkgname}::git+https://github.com/ahlstromcj/${_pkgname}.git")
-md5sums=('SKIP')
+source=("${_pkgname}::git+https://github.com/ahlstromcj/${_pkgname}.git"
+        'seq66-destdir.patch')
+md5sums=('SKIP'
+         'b0acb87040cef1ff9ddaff9154be6632')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -23,6 +25,13 @@ pkgver() {
   echo "$ver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+
+  # some install commands do not respect DESTDIR properly
+  patch -p1 -r -N -i "${srcdir}"/seq66-destdir.patch
+}
+
 build() {
   cd "${srcdir}/${_pkgname}"
 
@@ -35,5 +44,5 @@ package() {
   depends+=('libasound.so' 'libjack.so' 'liblo.so')
   cd "${srcdir}/${_pkgname}"
 
-  make DESTDIR="${pkgdir}/" install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/seq66-destdir.patch b/seq66-destdir.patch
new file mode 100644
index 000000000000..92eac2f96054
--- /dev/null
+++ b/seq66-destdir.patch
@@ -0,0 +1,28 @@
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 98af1d7e..6e4013d9 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -136,8 +136,10 @@ install-data-local:
+ 	cp -r -p $(top_builddir)/data/seq66cli/* $(datafolder)/seq66cli/
+ 	cp -r -p $(top_builddir)/data/win/* $(datafolder)/win/
+ 	cp -r -p $(top_builddir)/data/wrk/* $(datafolder)/wrk/
+-	cp -p $(top_srcdir)/data/share/applications/seq66.desktop $(datadir)/applications/
+-	cp -r -p $(top_srcdir)/data/share/icons/* $(datadir)/icons/
++	mkdir -p $(DESTDIR)$(datadir)/applications
++	cp -p $(top_srcdir)/data/share/applications/seq66.desktop $(DESTDIR)$(datadir)/applications
++	mkdir -p $(DESTDIR)$(datadir)/icons
++	cp -r -p $(top_srcdir)/data/share/icons/* $(DESTDIR)$(datadir)/icons/
+ 	@echo "Copying Seq66 documentation to $(docfolder)..."
+ 	mkdir -p $(docfolder)
+ 	cp -r -p $(top_srcdir)/data/share/doc/*.pdf $(docfolder)
+@@ -154,8 +156,8 @@ install-data-local:
+ uninstall-hook:
+ 	rm -rf $(datafolder)
+ 	rm -rf $(docfolder)
+-	rm -f $(datadir)/applications/seq66.desktop
+-	find $(datadir)/icons/ -iname "*seq66*.png" -exec rm -f '{}' \;
++	rm -f $(DESTDIR)$(datadir)/applications/seq66.desktop
++	find $(DESTDIR)$(datadir)/icons/ -iname "*seq66*.png" -exec rm -f '{}' \;
+ 
+ #******************************************************************************
+ # Makefile.am (seq66/include)