diff --git a/package/gluon-config-mode-geo-location-osm/Makefile b/package/gluon-config-mode-geo-location-osm/Makefile index a0710e662ed7800abca47e680d8dc62590f90688..2e101223ff374a44eed89659130b5d80be89a7ac 100644 --- a/package/gluon-config-mode-geo-location-osm/Makefile +++ b/package/gluon-config-mode-geo-location-osm/Makefile @@ -13,7 +13,7 @@ define Package/gluon-config-mode-geo-location-osm/install $(Gluon/Build/Install) $(INSTALL_DIR) $(1)/lib/gluon/config-mode/www/static/ - $(LN) /lib/gluon/web/www/static/gluon-web-osm.min.js $(1)/lib/gluon/config-mode/www/static/gluon-web-osm.js + $(LN) /lib/gluon/web/www/static/gluon-web-osm.js $(1)/lib/gluon/config-mode/www/static/ endef $(eval $(call BuildPackageGluon,gluon-config-mode-geo-location-osm)) diff --git a/package/gluon-web-osm/Makefile b/package/gluon-web-osm/Makefile index 3594da80347b274ff3be7a7e7a4f8bbd995d8b98..31f4b7b70da0e1261f1038d036291c08dbd13ff7 100644 --- a/package/gluon-web-osm/Makefile +++ b/package/gluon-web-osm/Makefile @@ -8,4 +8,17 @@ define Package/gluon-web-osm TITLE:=base src for OSM inlay endef +PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY + +define Package/gluon-web-osm/install + $(Gluon/Build/Install) + $(INSTALL_DIR) $(1)/lib/gluon/web/www/static/ + +ifdef CONFIG_GLUON_MINIFY + $(INSTALL_DATA) ./javascript/gluon-web-osm.min.js $(1)/lib/gluon/web/www/static/gluon-web-osm.js +else + $(INSTALL_DATA) ./javascript/gluon-web-osm.js $(1)/lib/gluon/web/www/static/ +endif +endef + $(eval $(call BuildPackageGluon,gluon-web-osm)) diff --git a/package/gluon-web-osm/javascript/gluon-web-osm.js b/package/gluon-web-osm/javascript/gluon-web-osm.js index 10bba2a8227dd56c59b6a9ef0d32c6953d4083b5..65d525abef1705cad51bd44a57cf182c342bf1c0 100644 --- a/package/gluon-web-osm/javascript/gluon-web-osm.js +++ b/package/gluon-web-osm/javascript/gluon-web-osm.js @@ -1,7 +1,7 @@ /* Build using: - uglifyjs javascript/gluon-web-osm.js -o files/lib/gluon/web/www/static/gluon-web-osm.min.js -c -m + uglifyjs javascript/gluon-web-osm.js -o javascript/gluon-web-osm.min.js -c -m */ 'use strict'; diff --git a/package/gluon-web-osm/files/lib/gluon/web/www/static/gluon-web-osm.min.js b/package/gluon-web-osm/javascript/gluon-web-osm.min.js similarity index 100% rename from package/gluon-web-osm/files/lib/gluon/web/www/static/gluon-web-osm.min.js rename to package/gluon-web-osm/javascript/gluon-web-osm.min.js