[arch-commits] Commit in notion/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Thursday, December 19, 2013 @ 13:48:45
  Author: spupykin
Revision: 102762

upgpkg: notion 20131219-2

upd

Modified:
  notion/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-19 11:22:34 UTC (rev 102761)
+++ PKGBUILD	2013-12-19 12:48:45 UTC (rev 102762)
@@ -5,7 +5,7 @@
 
 pkgname=notion
 pkgver=20131219
-pkgrel=1
+pkgrel=2
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
 arch=('i686' 'x86_64')
@@ -39,26 +39,27 @@
   cd ${srcdir}
   sed -i 's|lua5.2|lua|g' notion/system-autodetect.mk
   sed -i 's|luac5.2|luac|g' notion{,-libextl}/system-autodetect.mk
-}
 
-build() {
-  cd ${srcdir}
-
   for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr mod_notionflux notion-doc; do
     mkdir -p ${srcdir}/notion/$i
     cp -r ${srcdir}/$pkgname-$i/* ${srcdir}/notion/$i/
   done
 
-  # build notion
   cd ${srcdir}/notion
-  msg "Starting make..."
   sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \
 	-e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \
 	-e 's/^\(LUA_DIR=\).*$/\1\/usr/' \
 	-e 's/^\(X11_PREFIX=\).*/\1\/usr/' \
+	-e 's|/usr/local|/usr|g' \
 	-i system-autodetect.mk
-  make INCLUDES=-I${srcdir}/notion
+}
 
+build() {
+  cd ${srcdir}/notion
+
+  # build notion
+  make INCLUDES=-I${srcdir}/notion PREFIX=/usr
+
   # build doc and modules
   for i in mod_xinerama mod_xkbevents mod_xrandr; do
     (cd $i && make -j1 TOPDIR=.. all)