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

[andyrtr at archlinux.org]

    Date: Monday, January 7, 2013 @ 13:55:51
  Author: andyrtr
Revision: 174823

make compile/install more simple, no need for sed here

Modified:
  nx/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-07 18:49:23 UTC (rev 174822)
+++ PKGBUILD	2013-01-07 18:55:51 UTC (rev 174823)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
 pkgver=3.5.0.17
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
 license=('GPL')
@@ -34,14 +34,16 @@
   echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
   popd
 
-  # fix two broken Makefiles
-  sed -i "s:/usr/local:/usr:" Makefile
+  # fix a broken Makefiles
   sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
 
-  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+  make \
+    PREFIX=/usr \
+    CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+    
   # fake install
   mkdir $srcdir/fakeinstall
-  make DESTDIR="$srcdir/fakeinstall" install
+  make PREFIX=/usr DESTDIR="$srcdir/fakeinstall" install
 }
 
 package_libxcomp() {