diff --git a/Makefile b/Makefile
index 90d22e5..d44a748 100644
--- a/Makefile
+++ b/Makefile
@@ -11,45 +11,45 @@ PREFIX  = /usr/local
 
 EXECUTABLE = ttysolitaire
 SRC_DIR    = src
-SRC        = ${SRC_DIR}/ttysolitaire.c
-SRC_OBJECTS = ${SRC_DIR}/common.o   \
-              ${SRC_DIR}/frame.o    \
-              ${SRC_DIR}/card.o     \
-              ${SRC_DIR}/stack.o    \
-              ${SRC_DIR}/deck.o     \
-              ${SRC_DIR}/cursor.o   \
-              ${SRC_DIR}/keyboard.o \
-              ${SRC_DIR}/gui.o      \
-              ${SRC_DIR}/game.o     \
+SRC        = $(SRC_DIR)/ttysolitaire.c
+SRC_OBJECTS = $(SRC_DIR)/common.o   \
+              $(SRC_DIR)/frame.o    \
+              $(SRC_DIR)/card.o     \
+              $(SRC_DIR)/stack.o    \
+              $(SRC_DIR)/deck.o     \
+              $(SRC_DIR)/cursor.o   \
+              $(SRC_DIR)/keyboard.o \
+              $(SRC_DIR)/gui.o      \
+              $(SRC_DIR)/game.o     \
 
 TESTS_EXECUTABLE = ttysolitaire_test
 TESTS_DIR        = tests
-TESTS_SRC        = ${TESTS_DIR}/ttysolitaire_test.c
-TESTS_OBJECTS = ${TESTS_DIR}/frame_test.o       \
-                ${TESTS_DIR}/card_test.o        \
-                ${TESTS_DIR}/stack_test.o       \
-                ${TESTS_DIR}/deck_test.o        \
-                ${TESTS_DIR}/cursor_test.o      \
-                ${TESTS_DIR}/keyboard_test.o    \
-                ${TESTS_DIR}/gui_test.o         \
-                ${TESTS_DIR}/game_test.o        \
-                ${TESTS_DIR}/test_helper.o      \
-                ${TESTS_DIR}/test_helper_test.o \
+TESTS_SRC        = $(TESTS_DIR)/ttysolitaire_test.c
+TESTS_OBJECTS = $(TESTS_DIR)/frame_test.o       \
+                $(TESTS_DIR)/card_test.o        \
+                $(TESTS_DIR)/stack_test.o       \
+                $(TESTS_DIR)/deck_test.o        \
+                $(TESTS_DIR)/cursor_test.o      \
+                $(TESTS_DIR)/keyboard_test.o    \
+                $(TESTS_DIR)/gui_test.o         \
+                $(TESTS_DIR)/game_test.o        \
+                $(TESTS_DIR)/test_helper.o      \
+                $(TESTS_DIR)/test_helper_test.o \
 
-.PHONY: test clean
+.PHONY: test clean install uninstall
 
-ttysolitaire: ${SRC_OBJECTS}
-	${CC} ${CFLAGS} ${SRC} -o ${EXECUTABLE} ${SRC_OBJECTS} ${LDFLAGS}
+ttysolitaire: $(SRC_OBJECTS)
+	$(CC) $(CFLAGS) $(SRC) -o $(EXECUTABLE) $(SRC_OBJECTS) $(LDFLAGS)
 
-test: ${SRC_OBJECTS} ${TESTS_OBJECTS}
-	@${CC} ${CFLAGS} ${TESTS_SRC} -o ${TESTS_EXECUTABLE} ${TESTS_OBJECTS} ${SRC_OBJECTS} ${LDFLAGS}
-	@./${TESTS_EXECUTABLE}
+test: $(SRC_OBJECTS) $(TESTS_OBJECTS)
+	@$(CC) $(CFLAGS) $(TESTS_SRC) -o $(TESTS_EXECUTABLE) $(TESTS_OBJECTS) $(SRC_OBJECTS) $(LDFLAGS)
+	@./$(TESTS_EXECUTABLE)
 
 clean:
-	rm -rf {${SRC_DIR},${TESTS_DIR}}/*.o ${EXECUTABLE} ${TESTS_EXECUTABLE}
+	@rm -rf {$(SRC_DIR),$(TESTS_DIR)}/*.o $(EXECUTABLE) $(TESTS_EXECUTABLE)
 
 install:
-	cp -pf ${EXECUTABLE} ${PREFIX}/bin
+	@install -Dm755 $(EXECUTABLE) $(DESTDIR)$(PREFIX)/bin/$(EXECUTABLE)
 
 uninstall:
-	rm -f ${PREFIX}/bin/${EXECUTABLE}
+	@rm -f $(PREFIX)/bin/$(EXECUTABLE)