Drop prepare(), move meson to build()

2 files changed, 8 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7c3e4fe2e6bf..30958ff7e551 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,17 +38,6 @@ options=(!libtool)
 source=('git+https://gitlab.gnome.org/GNOME/gegl.git')
 sha512sums=('SKIP')
 
-prepare() {
-    mkdir "${srcdir}/build" -p
-
-    export CFLAGS CXXFLAGS LDFLAGS
-    meson "${srcdir}/${_pkgname}"\
-          "${srcdir}/build" \
-        --prefix=/usr \
-        -Dworkshop=true
-}
-
-
 pkgver() {
   cd ${srcdir}/${_pkgname}
   printf "%s.r%s.%s" \
@@ -58,6 +47,10 @@ pkgver() {
 }
 
 build() {
+    meson "${srcdir}/${_pkgname}"\
+          "${srcdir}/build" \
+        --prefix=/usr \
+        -Dworkshop=true
     export NINJA_STATUS="[%p | %f<%r<%u | %cbps ] "
     ninja -C "${srcdir}/build"
 }
diff --git a/PKGBUILD.in b/PKGBUILD.in
index d8659100c31b..e40ed2dd49c6 100644
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -52,17 +52,6 @@ options=(!libtool)
 source=('git+https://gitlab.gnome.org/GNOME/gegl.git')
 sha512sums=('SKIP')
 
-prepare() {
-    mkdir "${srcdir}/build" -p
-
-    export CFLAGS CXXFLAGS LDFLAGS
-    meson "${srcdir}/${_pkgname}"\
-          "${srcdir}/build" \
-        --prefix=/usr \
-        -Dworkshop=true
-}
-
-
 pkgver() {
   cd ${srcdir}/${_pkgname}
   printf "%s.r%s.%s" \
@@ -72,6 +61,10 @@ pkgver() {
 }
 
 build() {
+    meson "${srcdir}/${_pkgname}"\
+          "${srcdir}/build" \
+        --prefix=/usr \
+        -Dworkshop=true
     export NINJA_STATUS="[%p | %f<%r<%u | %cbps ] "
     ninja -C "${srcdir}/build"
 }