clean up

1 files changed, 24 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 113c30a4d634..01544ff774b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 #
-# codelite PKGBUILD
+# PKGBUILD for codelite
 #
 # Maintainer: Uffe Jakobsen <uffe@uffe.org>
 #
@@ -18,7 +18,8 @@
 # 20151027: sudo chmod 000 /usr/lib/codelite/LLDBDebugger.so
 #
 
-pkgname=codelite
+_pkgname=codelite
+pkgname=${_pkgname}
 pkgver=14.0
 pkgrel=1
 pkgdesc="Cross platform C/C++/PHP and Node.js IDE written in C++"
@@ -32,7 +33,7 @@ depends=('wxgtk'
           'libssh'
           'mariadb-libs'
           'ncurses'
-          'xterm' 'curl'
+          'xterm' 'wget' 'curl'
           'python2'
         )
 optdepends=('graphviz: callgraph visualization'
@@ -42,13 +43,13 @@ optdepends=('graphviz: callgraph visualization'
              'valgrind: debugger'
             )
 
-#source=(https://github.com/eranif/${pkgname}/archive/${pkgver//_/-}.tar.gz
+#source=(https://github.com/eranif/${_pkgname}/archive/${pkgver//_/-}.tar.gz
 #        http://repos.codelite.org/wxCrafterLibs/wxgui.zip)
 #noextract=('wxgui.zip')
 
 
 source=(
-    "${pkgname}-${pkgver}.tar.gz::https://github.com/eranif/${pkgname}/archive/${pkgver//_/-}.tar.gz"
+    "${_pkgname}-${pkgver}.tar.gz::https://github.com/eranif/${_pkgname}/archive/${pkgver//_/-}.tar.gz"
     http://repos.codelite.org/wxCrafterLibs/wxgui.zip
   )
 
@@ -65,7 +66,9 @@ md5sums=('e9d2519fa8077ca9f86b6b8fa9adf332'
 #fi
 
 
-pkg_name_ver="${pkgname}-${pkgver//_/-}"
+BUILD_DIR="_build"
+pkg_name_ver="${_pkgname}-${pkgver//_/-}"
+
 
 prepare()
 {
@@ -79,18 +82,26 @@ build()
 cd "${srcdir}/${pkg_name_ver}"
 
 CXXFLAGS="${CXXFLAGS} -fno-devirtualize"
+export CXXFLAGS
+
+# cmake find_package() will try env var WX_CONFIG as wx-config tool path before checking its builtin hardcoded naming conbinations for wx-config tool
+WX_CONFIG="wx-config-gtk2"
+export WX_CONFIG
+
+mkdir -p "${BUILD_DIR}"
+#cd "${BUILD_DIR}"
+
+cmake -B "${BUILD_DIR}" -S . -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DWITH_WX_CONFIG=${WX_CONFIG} -DENABLE_LLDB=1 -DWITH_MYSQL=1 -DCMAKE_INSTALL_LIBDIR=lib
+make -C "${BUILD_DIR}"
 
-mkdir -p build
-cd build
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DENABLE_CLANG=1 -DENABLE_LLDB=1 -DWITH_MYSQL=1 -DCMAKE_INSTALL_LIBDIR=lib ..
-make
 }
 
 package()
 {
-cd "${srcdir}/${pkg_name_ver}/build"
-make -j1 DESTDIR="${pkgdir}" install
-install -m 644 -D "${srcdir}/${pkg_name_ver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+cd "${srcdir}/${pkg_name_ver}"
+
+make -C "${BUILD_DIR}" -j1 DESTDIR="${pkgdir}" install
+install -m 644 -D "${srcdir}/${pkg_name_ver}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 #install -m 755 -D "${srcdir}/wxCrafter.so" "${pkgdir}/usr/lib/codelite/wxCrafter.so"
 #install -m 644 -D "${srcdir}/wxgui.zip" "${pkgdir}/usr/share/codelite/wxgui.zip"
 }