31 lines
972 B
Text
31 lines
972 B
Text
|
Index: Makefile
|
||
|
|
--- Makefile.orig
|
||
|
|
+++ Makefile
|
||
|
|
@@ -53,7 +53,7 @@ clean:
|
||
|
|
@$(call print_step,"Cleaning files...")
|
||
|
|
@rm -rf bin/ dist/ web/bindata.go
|
||
|
|
|
||
|
|
-build: build-bin build-assets build-docs
|
||
|
|
+build: build-bin build-assets
|
||
|
|
|
||
|
|
ifneq ($(filter builtin_assets,$(TAGS)),)
|
||
|
|
build-bin: build-assets
|
||
|
|
@@ -75,7 +75,7 @@ endif
|
||
|
|
|
||
|
|
build-assets: ui/node_modules
|
||
|
|
@$(call print_step,"Building assets...")
|
||
|
|
- @rm -rf $(DIST_DIR)/assets/ && $(YARN) $(YARN_ARGS) build --env $(ENV)
|
||
|
|
+ @rm -rf $(DIST_DIR)/assets/ && cd ui; npm run build
|
||
|
|
|
||
|
|
build-docs:
|
||
|
|
ifeq ($(filter skip_docs,$(TAGS)),)
|
||
|
|
@@ -100,7 +100,7 @@ install-bin: build-bin
|
||
|
|
@$(call print_step,"Installing binaries...")
|
||
|
|
@install -d -m 0755 $(PREFIX)/bin && install -m 0755 bin/* $(PREFIX)/bin/
|
||
|
|
|
||
|
|
-install-docs: build-docs
|
||
|
|
+install-docs:
|
||
|
|
ifneq ($(filter build_docs,$(TAGS)),)
|
||
|
|
@$(call print_step,"Installing manual pages...")
|
||
|
|
@install -d -m 0755 $(PREFIX)/share/man/man1 && cp -r $(DIST_DIR)/man/* $(PREFIX)/share/man/man1
|