summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Newgard2013-05-12 02:59:06 -0500
committerDoug Newgard2013-05-12 02:59:06 -0500
commite4daff433c8facccf3022def2bfd9700ef818363 (patch)
tree9d2cc7a674e443752d497e0dd187e43d62ae49ee
parent55d7d15f013e51fd5b418c3b8916af37d82148bf (diff)
downloadaur-e4daff433c8facccf3022def2bfd9700ef818363.tar.gz
Move bin to /usr/bin
-rw-r--r--.SRCINFO2
-rw-r--r--.gitignore3
-rw-r--r--PKGBUILD7
-rw-r--r--entrance.service2
4 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 03beab579d5..dc778ce4945 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = entrance-git
pkgdesc = Enlightenment Display Manager
- pkgver = 0.0.4.19
+ pkgver = 0.0.4.19.7fd0458
pkgrel = 1
url = http://trac.enlightenment.org/e
arch = i686
diff --git a/.gitignore b/.gitignore
index cfd5f1c6530..1561e82616a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
+*/
*~
-src/
-pkg/
*.tar.*
*.log
diff --git a/PKGBUILD b/PKGBUILD
index 75ec34ae524..51af3194bc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=entrance-git
_pkgname=entrance
-pkgver=0.0.4.19
+pkgver=0.0.4.19.7fd0458
pkgrel=1
pkgdesc="Enlightenment Display Manager"
url="http://trac.enlightenment.org/e"
@@ -24,7 +24,9 @@ md5sums=('SKIP'
pkgver() {
cd "$srcdir/$_pkgname"
- echo $(awk -F , '/^AC_INIT/ {print $2}' configure.ac | tr -d '[ ]').$(git rev-list --count HEAD)
+ local _ver=$(awk -F , '/^AC_INIT/ {print $2}' configure.ac | tr -d '[ ]')
+
+ echo $_ver.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
}
build () {
@@ -32,6 +34,7 @@ build () {
./autogen.sh \
--prefix=/usr \
+ --sbindir=/usr/bin \
--sysconfdir=/etc
make
diff --git a/entrance.service b/entrance.service
index de9d8ae4356..ae7fb8de56f 100644
--- a/entrance.service
+++ b/entrance.service
@@ -4,7 +4,7 @@ Conflicts=getty@tty1.service
After=systemd-user-sessions.service
[Service]
-ExecStart=/usr/sbin/entrance --nodaemon
+ExecStart=/usr/bin/entrance --nodaemon
Restart=always
[Install]