Skip to content

Commit

Permalink
makefile cleanup continued.
Browse files Browse the repository at this point in the history
  • Loading branch information
tchalvak committed Mar 3, 2023
1 parent 0f7744b commit a5a08ea
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,15 @@ conf-resources:
cp -upn ./deploy/resources.build.php ./deploy/resources.php || true
echo "Note that this does not overwrite existing resources.php"

build: conf-resources dep
build: conf-resources dep check-base
@echo " ====== Continuing app-specific parts of the build ===="
@echo "Building the deps, linking the components, and building static .html"
@echo "Building the deps, linking the components, and building static .html"
@ln -sf "$(RELATIVE_COMPONENTS)jquery/jquery.min.js" "$(JS)"
@ln -sf "$(RELATIVE_COMPONENTS)jquery/jquery.min.map" "$(JS)"
@ln -sf "$(RELATIVE_COMPONENTS)jquery-timeago/jquery.timeago.js" "$(JS)"
@ln -sf "$(RELATIVE_COMPONENTS)jquery-linkify/jquery.linkify.js" "$(JS)"
@ln -sf "$(RELATIVE_VENDOR)twbs/bootstrap/dist/css/bootstrap.min.css" "$(CSS)"
@ln -sf "$(RELATIVE_VENDOR)twbs/bootstrap/dist/js/bootstrap.min.js" "$(JS)"
make check-base
php deploy/www/intro-controller.php > deploy/www/intro.html
php deploy/www/front-controller.php > deploy/www/index.html
php deploy/www/login-controller.php > deploy/www/login.html
Expand Down Expand Up @@ -79,7 +78,7 @@ postcheck:
php ./deploy/check.php
echo "Check that the webserver user has permissions to the script!"

install: preconfig create-directories build postcheck
install: conf-resources preconfig create-directories build postcheck

install-admin: preconfig build start-chat writable postcheck

Expand Down

0 comments on commit a5a08ea

Please sign in to comment.