Added PREFIX and DESTDIR vars to Makefile.

geddy · Dec 18, 2011 · 43b5d66 · 43b5d66
1 parent b83b7de
commit 43b5d66
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -17,22 +17,26 @@
 
 .PHONY: all build install clean uninstall
 
+PREFIX=/usr/local
+DESTDIR=
+
 all: build
 
 build:
 	@echo 'Geddy built.'
 
 install:
-	@mkdir -p /usr/local/lib/node_modules/geddy && \
-		cp -R ./* /usr/local/lib/node_modules/geddy/ && \
-		ln -snf /usr/local/lib/node_modules/geddy/bin/cli.js /usr/local/bin/geddy && \
-		chmod 755 /usr/local/lib/node_modules/geddy/bin/cli.js && \
+	@mkdir -p $(DESTDIR)$(PREFIX)/bin \
+	  mkdir -p $(DESTDIR)$(PREFIX)/lib/node_modules/geddy && \
+		cp -R ./* $(DESTDIR)$(PREFIX)/lib/node_modules/geddy/ && \
+		ln -snf $(DESTDIR)$(PREFIX)/lib/node_modules/geddy/bin/cli.js $(DESTDIR)$(PREFIX)/bin/geddy && \
+		chmod 755 $(DESTDIR)$(PREFIX)/lib/node_modules/geddy/bin/cli.js && \
 		echo 'Geddy installed.'
 
 clean:
 	@true
 
 uninstall:
-	@rm -f /usr/local/bin/geddy && \
-		rm -fr /usr/local/lib/node_modules/geddy/ && \
+	@rm -f $(DESTDIR)$(PREFIX)/bin/geddy && \
+		rm -fr $(DESTDIR)$(PREFIX)/lib/node_modules/geddy/ && \
 		echo 'Geddy uninstalled.'
diff --git a/bin/cli.js b/bin/cli.js
@@ -98,6 +98,7 @@ var start = function () {
   // Worker-process -- start up an app
   else {
     w = new worker.Worker();
+    geddy.worker = w;
     w.init(function () {
       geddy.mixin(geddy, w);
       app = new App();

diff --git a/lib/app.js b/lib/app.js
@@ -331,6 +331,13 @@ var App = function () {
 
             controller.cookies = new CookieCollection(req);
 
+            if (method == 'POST') {
+              geddy.log.debug(method + ' ' + req.url);
+              req.addListener('data', function (data) {
+                geddy.log.debug('received data');
+              });
+            }
+
             if (geddy.config.sessions) {
               controller.session =
                   new sessions.Session(controller, function () {