]> gitweb.fluxo.info Git - templater.git/commitdiff
Updates default Makefile
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 16 May 2020 15:40:48 +0000 (12:40 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 16 May 2020 15:40:48 +0000 (12:40 -0300)
share/templater/templater/files/Makefile

index 6dbbd98d8769c600eed5a2cc4bfe148dcf10ce76..3a988d454e82afc08f9eef991c748194233e5f8a 100644 (file)
@@ -7,7 +7,10 @@
 
 # Port to serve content
 HTTP_PORT="8000"
-HTTP_SERVER="SimpleHTTPServer"
+HTTP_SERVER="http.server"
+
+# Base to serve the content
+HTTP_BASE="."
 
 # Set CONTAINER based in what we have available in the system
 # This variable can be user in other, included Makefiles to handle virtualization tasks
@@ -24,10 +27,10 @@ endif
 # See http://unix.stackexchange.com/questions/32182/simple-command-line-http-server#32200
 #     http://php.net/manual/en/features.commandline.webserver.php
 serve:
-       @if [ "$(HTTP_SERVER)" = "SimpleHTTPServer" ]; then python -m SimpleHTTPServer $(HTTP_PORT);              fi
-       @if [ "$(HTTP_SERVER)" = "ssi_server"       ]; then PYTHONDONTWRITEBYTECODE=0 ssi_server.py $(HTTP_PORT); fi
-       @if [ "$(HTTP_SERVER)" = "http.server"      ]; then python3 -m http.server $(HTTP_PORT);                  fi
-       @if [ "$(HTTP_SERVER)" = "php"              ]; then php -S localhost:$(HTTP_PORT);                        fi
+       @if [ "$(HTTP_SERVER)" = "SimpleHTTPServer" ]; then cd $(HTTP_BASE) && python -m SimpleHTTPServer $(HTTP_PORT);              fi
+       @if [ "$(HTTP_SERVER)" = "ssi_server"       ]; then cd $(HTTP_BASE) && PYTHONDONTWRITEBYTECODE=0 ssi_server.py $(HTTP_PORT); fi
+       @if [ "$(HTTP_SERVER)" = "http.server"      ]; then cd $(HTTP_BASE) && python3 -m http.server $(HTTP_PORT);                  fi
+       @if [ "$(HTTP_SERVER)" = "php"              ]; then cd $(HTTP_BASE) && php -S localhost:$(HTTP_PORT);                        fi
 
 # Configure a git post-receive hook
 post_receive: