summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane McDonald <me@shanemcd.com>2022-12-03 01:03:48 +0100
committerGitHub <noreply@github.com>2022-12-03 01:03:48 +0100
commit99b643bd77f9a3f4ffd89521901c50655be0ff93 (patch)
tree3c4abec0d5fb0634d9af6d2dc425eab5cfd8b980
parentMerge pull request #13209 from marshmalien/5990-related-group-column (diff)
parentCopy UI static files to /var/lib/awx only for ui-devel build (diff)
downloadawx-99b643bd77f9a3f4ffd89521901c50655be0ff93.tar.xz
awx-99b643bd77f9a3f4ffd89521901c50655be0ff93.zip
Merge pull request #13268 from simaishi/fix_static
Copy UI static files to /var/lib/awx only for ui-devel build
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index d239752435..c11f244635 100644
--- a/Makefile
+++ b/Makefile
@@ -389,18 +389,18 @@ $(UI_BUILD_FLAG_FILE):
$(PYTHON) tools/scripts/compilemessages.py
$(NPM_BIN) --prefix awx/ui --loglevel warn run compile-strings
$(NPM_BIN) --prefix awx/ui --loglevel warn run build
- mkdir -p /var/lib/awx/public/static/css
- mkdir -p /var/lib/awx/public/static/js
- mkdir -p /var/lib/awx/public/static/media
- cp -r awx/ui/build/static/css/* /var/lib/awx/public/static/css
- cp -r awx/ui/build/static/js/* /var/lib/awx/public/static/js
- cp -r awx/ui/build/static/media/* /var/lib/awx/public/static/media
touch $@
ui-release: $(UI_BUILD_FLAG_FILE)
ui-devel: awx/ui/node_modules
@$(MAKE) -B $(UI_BUILD_FLAG_FILE)
+ mkdir -p /var/lib/awx/public/static/css
+ mkdir -p /var/lib/awx/public/static/js
+ mkdir -p /var/lib/awx/public/static/media
+ cp -r awx/ui/build/static/css/* /var/lib/awx/public/static/css
+ cp -r awx/ui/build/static/js/* /var/lib/awx/public/static/js
+ cp -r awx/ui/build/static/media/* /var/lib/awx/public/static/media
ui-devel-instrumented: awx/ui/node_modules
$(NPM_BIN) --prefix awx/ui --loglevel warn run start-instrumented