diff -Naur wsapi-1.6.1/configure wsapi-1.6.1.new/configure
--- wsapi-1.6.1/configure	2017-04-24 17:17:45.000000000 +0530
+++ wsapi-1.6.1.new/configure	2017-04-26 13:57:02.054030515 +0530
@@ -1,25 +1,8 @@
 #!/bin/sh
 
-if [ $1 == "--help" ]; then
-  echo "Usage: configure lua51"
-  echo "where lua51 is the name of your Lua executable"
-  exit 0
-fi
+lua_bin=/usr/bin/lua
+lua_bin_dir=/usr/bin
 
-echo "Trying to find where you installed Lua..."
-
-if [ $1 != "" ]; then
-  lua=$1
-else
-  lua="lua51"
-fi
-
-lua_bin=`which $lua`
-lua_bin_dir=`dirname $lua_bin`
-
-lua_root=`dirname $lua_bin_dir`
-
-if [ $lua_root != "" ]; then
   echo "Lua is in $lua_root"
   echo "Writing config"
   lua_share=$lua_root/share/lua/5.1
@@ -30,7 +13,4 @@
   echo "BIN_DIR= $bin_dir" >> config
   echo "LUA_LIBDIR= $lua_lib" >> config
   echo "Now run 'make && sudo make install'"
-else
-  echo "Lua not found, please install Lua 5.1 (and put in your PATH)"
-fi
 
diff -Naur wsapi-1.6.1/Makefile wsapi-1.6.1.new/Makefile
--- wsapi-1.6.1/Makefile	2017-04-24 17:17:45.000000000 +0530
+++ wsapi-1.6.1.new/Makefile	2017-04-26 13:57:02.121030515 +0530
@@ -2,12 +2,6 @@
 
 include config
 
-DESTDIR := /
-LDIR := $(DESTDIR)/$(LUA_DIR)
-WDIR := $(DESTDIR)/$(LUA_DIR)/wsapi
-CDIR := $(DESTDIR)/$(LUA_LIBDIR)
-BDIR := $(DESTDIR)/$(BIN_DIR)
-
 all: cgi fastcgi
 
 cgi:
@@ -19,21 +13,20 @@
 
 fcgi: fastcgi
 
-src/fastcgi/lfcgi.so: src/fastcgi/lfcgi.h
-	$(CC) $(CFLAGS) $(LDFLAGS) $(LIB_OPTION) -o src/fastcgi/lfcgi.so src/fastcgi/lfcgi.c -lfcgi $(INC)
+src/fastcgi/lfcgi.so: src/fastcgi/lfcgi.o src/fastcgi/lfcgi.h
+	$(CC) $(CFLAGS) $(LIB_OPTION) $(LDFLAGS) -o src/fastcgi/lfcgi.so src/fastcgi/lfcgi.o -lfcgi 
 
 install:
-	@mkdir -p $(LDIR) $(WDIR) $(BDIR)
-	@cp src/*.lua $(LDIR)
-	@cp src/wsapi/*.lua $(WDIR)
-	@cp src/launcher/wsapi.cgi $(BDIR)
-	@cp src/launcher/wsapi.fcgi $(BDIR)
-	@echo "Installing of Lua WSAPI part is done!"
+	mkdir -p $(DESTDIR)/$(LUA_DIR)/wsapi
+	mkdir -p $(DESTDIR)/$(BIN_DIR)
+	cp src/*.lua $(DESTDIR)/$(LUA_DIR)
+	cp src/wsapi/*.lua $(DESTDIR)/$(LUA_DIR)/wsapi
+	cp src/launcher/wsapi.cgi $(DESTDIR)/$(BIN_DIR)
+	cp src/launcher/wsapi.fcgi $(DESTDIR)/$(BIN_DIR)
 
 install-fcgi:
-	@mkdir -p $(CDIR)
-	@cp src/fastcgi/lfcgi.so $(CDIR)
-	@echo "Installing of bundled Lua-fcgi lib is done!"
+	mkdir -p $(DESTDIR)/$(LUA_LIBDIR)
+	cp src/fastcgi/lfcgi.so $(DESTDIR)/$(LUA_LIBDIR)
 
 install-rocks: install
 	mkdir -p $(PREFIX)/samples
@@ -42,8 +35,7 @@
 	cp -r doc/* $(PREFIX)/doc
 
 clean:
-	@rm -f config src/fastcgi/lfcgi.so
-	@echo "Cleaning is done!"
+	rm src/fastcgi/lfcgi.o src/fastcgi/lfcgi.so
 
 snapshot:
 	git archive --format=tar --prefix=wsapi-$(VERSION)/ HEAD | gzip > wsapi-$(VERSION).tar.gz
