summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Swanson2015-08-05 01:06:05 -0700
committerMike Swanson2015-08-05 01:06:34 -0700
commit1db820a2fb0e031a3b6e74580bebab797426b9c5 (patch)
treee5eaf74305b9919cb01c07fda521f09c52ee40f5
parent50a16a801db307a56ff90853e5c08f145555422f (diff)
downloadaur-1db820a2fb0e031a3b6e74580bebab797426b9c5.tar.gz
Fix the install lines
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 7 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 222f303f8d8..5da269329cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
pkgbase = git-debubble
pkgdesc = Clean up merge bubbles in a Git repository
pkgver = 1.1
- pkgrel = 1
+ pkgrel = 3
url = http://www.catb.org/esr/git-debubble/
arch = any
license = GPL2
makedepends = asciidoc
depends = git
source = http://www.catb.org/esr/git-debubble/git-debubble-1.1.tar.gz
+ source = 0001-Makefile-Sanitize-the-install-and-uninstall-targets.patch
+ source = 0002-Correct-the-order-of-git-am-arguments.patch
sha256sums = 6b2cd99cea708a06b96068eedaa402ce61a50870cd734e446055312da031b6ef
+ sha256sums = 2f9440937cb6fa2b4a2b19c2b2964dfe3569bd05560023ff02d5e678890b025f
+ sha256sums = 528aa930db8bf9864a2c320a5cd9a8ac212128652946fa2cea90916b0ac1b8d7
pkgname = git-debubble
diff --git a/PKGBUILD b/PKGBUILD
index d937cbbed84..a7f563c37b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=git-debubble
pkgver=1.1
-pkgrel=2
+pkgrel=3
pkgdesc="Clean up merge bubbles in a Git repository"
arch=('any')
depends=('git')
@@ -37,7 +37,7 @@ build() {
package() {
cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" prefix=/usr install
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}