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

[Alexander Rødseth]

    Date: Thursday, October 17, 2013 @ 18:51:01
  Author: arodseth
Revision: 98756

Minor fix

Modified:
  netbeans/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-17 15:45:53 UTC (rev 98755)
+++ PKGBUILD	2013-10-17 16:51:01 UTC (rev 98756)
@@ -13,7 +13,7 @@
 license=('CDDL')
 depends=('java-environment' 'ttf-font' 'libxtst' 'giflib')
 backup=('usr/share/netbeans/etc/netbeans.conf')
-makedepends=('gendesk')
+makedepends=('gendesk' 'setconf')
 optdepends=('php: for developing programs in php'
             'groovy: for developing programs in groovy'
             'lib32-glibc')
@@ -23,8 +23,9 @@
 # http://dlc.sun.com.edgesuite.net/netbeans/7.4/final/zip/
 sha256sums=('bd9a7d1faab7c6a45c1b8d2e5ad11453c2ac767d2176836e65a5c7a62d7c365b')
 
-build() {
+prepare() {
   gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc"
+  setconf "$pkgname/bin/$pkgname" basedir "/usr/share/$pkgname"
 }
 
 package() {
@@ -31,14 +32,14 @@
   cd "$pkgname"
 
   mkdir -p "$pkgdir/usr/"{bin,share/applications}
-  cp -r ./ "$pkgdir/usr/share"
+  cp -r "../$pkgname" "$pkgdir/usr/share/"
   install -Dm644 "../$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
   install -Dm644 "nb/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm755 "$pkgdir/usr/share/bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm755 "bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
 
-  # Cleanup (contains the elf that is now placed in /usr/bin + .exe-files)
-  rm -r "$pkgdir/usr/share/bin"
+  # Cleanup (contains the file that is now placed in /usr/bin + .exe-files)
+  rm -r "$pkgdir/usr/share/$pkgname/bin"
 }
 
 # vim:set ts=2 sw=2 et: