From 225a173da78ee44cbed24eed9a0fd247dcb4a05c Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Wed, 11 May 2016 13:28:15 +0200 Subject: [PATCH] Altered Build/Compile to run from shared folder so grunt can access git info --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 648c5ec..81d9602 100644 --- a/Makefile +++ b/Makefile @@ -44,15 +44,16 @@ define Build/Prepare endef define Build/Compile - # We're cd'in into the build dir manually so it - # runs these in the build dir, instead of the - # shared customfeeds folder - cd $(PKG_BUILD_DIR) && npm install + # We're running grunt in the shared folder, so + # grunt can access git info + npm install ifeq ($(CONFIG_DOODLE3D_CLIENT_MINIFY_JS),y) - cd $(PKG_BUILD_DIR) && grunt less autoprefixer cssmin concat uglify + grunt less autoprefixer cssmin concat uglify else - cd $(PKG_BUILD_DIR) && grunt less autoprefixer cssmin concat + grunt less autoprefixer cssmin concat endif + # Copy compiled files to build dir + $(CP) www $(PKG_BUILD_DIR)/ endef define Package/doodle3d-client/install