diff --git a/Makefile b/Makefile
index e7e83bc..64ca296 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
 
-PATH_BUILD=./build
-PATH_TOOLS=./tools
+CWD=$(CURDIR)
+PATH_BUILD=${CWD}/build
+PATH_TOOLS=${CWD}/tools
 PATH_COMBINE_OUTPUT=${PATH_BUILD}/ease.js
 PATH_COMBINE_OUTPUT_FULL=${PATH_BUILD}/ease-full.js
 PATH_BROWSER_TEST=${PATH_TOOLS}/browser-test.html
-PATH_DOC=./doc
+PATH_DOC=${CWD}/doc
 PATH_DOC_OUTPUT=${PATH_BUILD}/doc
-MANUAL_TEXI=manual.texi
+PATH_DOC_OUTPUT_HTML=${PATH_DOC_OUTPUT}/manual
+PATH_MANUAL_TEXI=${PATH_DOC}/manual.texi
 
 COMBINE=${PATH_TOOLS}/combine
 
@@ -19,21 +21,20 @@ all:     combine doc
 
 # create build dir
 mkbuild:
-	mkdir -p ${PATH_BUILD}
+	@mkdir -p ${PATH_BUILD}
 
 # combine all modules into easily redistributable ease.js file (intended for
 # browser)
 combine: mkbuild
 	${COMBINE} > ${PATH_COMBINE_OUTPUT}
 	INC_TEST=1 ${COMBINE} > ${PATH_COMBINE_OUTPUT_FULL}
-	cp ${PATH_BROWSER_TEST} ${PATH_BUILD}
+	@cp ${PATH_BROWSER_TEST} ${PATH_BUILD}
 
 # run tests
 test: default
 	for test in `find ./test -name 'test-*.js'`; do \
 		node $${test}; \
 	done; \
-	
 	for test in `find ./test -regex '.*/test-[^\.]*'`; do \
 		./$$test; \
 	done;
@@ -42,8 +43,8 @@ test: default
 # files that were generaetd
 doc:
 	@mkdir -p ${PATH_DOC_OUTPUT}
-	pdftex -output-directory "${PATH_DOC}" ${PATH_DOC}/${MANUAL_TEXI}
-	pdftex -output-directory "${PATH_DOC}" ${PATH_DOC}/${MANUAL_TEXI}
+	pdftex -output-directory "${PATH_DOC}" ${PATH_MANUAL_TEXI}
+	pdftex -output-directory "${PATH_DOC}" ${PATH_MANUAL_TEXI}
 	find ${PATH_DOC} -type f \
 		! -name '*.texi' -a \
 		! -name '.*' -a \
@@ -51,8 +52,7 @@ doc:
 		| xargs rm
 	@mv -f ${PATH_DOC}/*.pdf ${PATH_DOC_OUTPUT}
 	cd ${PATH_DOC}; \
-		makeinfo --html -o manual ${MANUAL_TEXI}
-	@mv -f ${PATH_DOC}/manual ${PATH_DOC_OUTPUT}
+		makeinfo --html -o ${PATH_DOC_OUTPUT_HTML} ${PATH_MANUAL_TEXI}
 
 # clean up build dir
 clean: