diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile index 257ea47b..0c3a0f42 100644 --- a/package/gluon-config-mode-core/Makefile +++ b/package/gluon-config-mode-core/Makefile @@ -18,7 +18,7 @@ define Package/gluon-config-mode-core/install $(INSTALL_DIR) $(1)/lib/gluon/config-mode/view/ $(1)/lib/gluon/config-mode/www/static/ $(LN) /lib/gluon/web/i18n $(1)/lib/gluon/config-mode/ $(LN) /lib/gluon/web/view/{error,model} $(1)/lib/gluon/config-mode/view/ - $(LN) /lib/gluon/web/www/static/gluon-web-model.min.js $(1)/lib/gluon/config-mode/www/static/gluon-web-model.js + $(LN) /lib/gluon/web/www/static/gluon-web-model.js $(1)/lib/gluon/config-mode/www/static/ endef $(eval $(call BuildPackageGluon,gluon-config-mode-core)) diff --git a/package/gluon-web-model/Makefile b/package/gluon-web-model/Makefile index 518a5b47..9b1b0e7a 100644 --- a/package/gluon-web-model/Makefile +++ b/package/gluon-web-model/Makefile @@ -9,4 +9,17 @@ define Package/gluon-web-model DEPENDS:=+gluon-web endef +PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY + +define Package/gluon-web-model/install + $(Gluon/Build/Install) + $(INSTALL_DIR) $(1)/lib/gluon/web/www/static/ + +ifdef CONFIG_GLUON_MINIFY + $(INSTALL_DATA) ./javascript/gluon-web-model.min.js $(1)/lib/gluon/web/www/static/gluon-web-model.js +else + $(INSTALL_DATA) ./javascript/gluon-web-model.js $(1)/lib/gluon/web/www/static/ +endif +endef + $(eval $(call BuildPackageGluon,gluon-web-model)) diff --git a/package/gluon-web-model/javascript/gluon-web-model.js b/package/gluon-web-model/javascript/gluon-web-model.js index 05358b95..ec9cdc4a 100644 --- a/package/gluon-web-model/javascript/gluon-web-model.js +++ b/package/gluon-web-model/javascript/gluon-web-model.js @@ -13,7 +13,7 @@ /* Build using: - uglifyjs javascript/gluon-web-model.js -o files/lib/gluon/web/www/static/gluon-web-model.min.js -c -m --support-ie8 + uglifyjs javascript/gluon-web-model.js -o javascript/gluon-web-model.min.js -c -m --support-ie8 */ diff --git a/package/gluon-web-model/files/lib/gluon/web/www/static/gluon-web-model.min.js b/package/gluon-web-model/javascript/gluon-web-model.min.js similarity index 100% rename from package/gluon-web-model/files/lib/gluon/web/www/static/gluon-web-model.min.js rename to package/gluon-web-model/javascript/gluon-web-model.min.js