diff --git a/SDL/Makefile b/SDL/Makefile
index d36867b..ae89a77 100644
--- a/SDL/Makefile
+++ b/SDL/Makefile
@@ -52,19 +52,20 @@ SDL_OBJS	:= $(subst $(SDL_SRC_DIR),$(SDL_OBJ_DIR),$(SDL_SRCS:.c=.o))
 # What's a full build?
 all: $(LIB_DIR)/libSDL.a
 
-# Used to install library by pressing Alt+R in Programmer's Notepad
-run: all lib-install
-
 # How to delete the intermediate files.
 clean:
 	@echo Cleaning $(LIB_DIR) $(SDL_OBJS)
 	@rm -fr $(LIB_DIR) $(SDL_OBJS)
-	
-lib-install:
+
+install:
 	@mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR)
 	@mkdir -p $(INSTALL_HEADER_DIR)/SDL
 	@cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR)
 	@cp -frv include/*.* $(INSTALL_HEADER_DIR)/SDL
+
+# Used to install library by pressing Alt+R in Programmer's Notepad
+run:
+	all install
 	
 test-make:
 	$(MAKE) -f Makefile.test install
diff --git a/SDL_gfx/Makefile b/SDL_gfx/Makefile
index 147ed76..d54917a 100644
--- a/SDL_gfx/Makefile
+++ b/SDL_gfx/Makefile
@@ -17,7 +17,7 @@ SRC_DIR			:= src
 INCLUDE_DIR		:= include
 TEST_OBJ_DIR		:= $(OBJ_DIR)/test
 TEST_SRC_DIR		:= src
-INSTALL_HEADER_DIR	?= $(DEVKITPRO)/libogc/include/
+INSTALL_HEADER_DIR	?= $(DEVKITPRO)/libogc/include
 INSTALL_LIB_DIR		?= $(DEVKITPRO)/libogc/lib/wii
 
 # Tools.
@@ -44,7 +44,7 @@ $(LIB_DIR)/libSDL_gfx.a: $(OBJS)
 	@powerpc-gekko-ar crs $@ $(OBJS)
 	@echo ----
 	
-lib-install:
+install:
 	@mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR)
 	@mkdir -p $(INSTALL_HEADER_DIR)/SDL
 	@cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR)
diff --git a/SDL_image/Makefile b/SDL_image/Makefile
index 269cbd7..792b397 100644
--- a/SDL_image/Makefile
+++ b/SDL_image/Makefile
@@ -16,7 +16,7 @@ SRC_DIR			:= src
 INCLUDE_DIR		:= include
 TEST_OBJ_DIR		:= $(OBJ_DIR)/test
 TEST_SRC_DIR		:= src
-INSTALL_HEADER_DIR	?= $(DEVKITPRO)/libogc/include/
+INSTALL_HEADER_DIR	?= $(DEVKITPRO)/libogc/include
 INSTALL_LIB_DIR		?= $(DEVKITPRO)/libogc/lib/wii
 
 # Tools.
@@ -39,21 +39,21 @@ TEST_OBJS	:= $(subst $(TEST_SRC_DIR)/,$(TEST_OBJ_DIR)/,$(TEST_SRCS:.c=.o))
 TEST_DOLS	:= $(subst $(TEST_OBJ_DIR),$(BIN_DIR),$(TEST_OBJS:.o=.dol))
 
 # What's a full build?
-all: $(LIB_DIR)/libSDL_image.a $(INCLUDE_DIR)/SDL_image.h install
+all: $(LIB_DIR)/libSDL_image.a $(INCLUDE_DIR)/SDL_image.h
 
 # How to delete the intermediate files.
 clean:
 	@echo Cleaning $(LIB_DIR)/libSDL_image.a $(OBJ_DIR)
 	@rm -f $(LIB_DIR)/libSDL_image.a $(OBJS) $(TEST_OBJS)
 	
-lib-install:
+install:
 	@mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR)
 	@mkdir -p $(INSTALL_HEADER_DIR)/SDL
 	@cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR)
 	@cp -frv include/*.* $(INSTALL_HEADER_DIR)/SDL
 
 # How to install to SD card ready for running.
-install: $(TEST_DOLS)
+test-install: $(TEST_DOLS)
 	@-mkdir -p dols
 	cp $(TEST_DOLS) dols
 
diff --git a/SDL_mixer/Makefile b/SDL_mixer/Makefile
index 432ee35..f81244b 100644
--- a/SDL_mixer/Makefile
+++ b/SDL_mixer/Makefile
@@ -17,7 +17,7 @@ SRC_DIR			:= src
 INCLUDE_DIR		:= include
 TEST_OBJ_DIR		:= $(OBJ_DIR)/test
 TEST_SRC_DIR		:= src
-INSTALL_HEADER_DIR	?= $(DEVKITPRO)/libogc/include/
+INSTALL_HEADER_DIR	?= $(DEVKITPRO)/libogc/include
 INSTALL_LIB_DIR		?= $(DEVKITPRO)/libogc/lib/wii
 
 # Tools.
@@ -41,10 +41,10 @@ TEST_OBJS	:= $(subst $(TEST_SRC_DIR)/,$(TEST_OBJ_DIR)/,$(TEST_SRCS:.c=.o))
 TEST_DOLS	:= $(subst $(TEST_OBJ_DIR),$(BIN_DIR),$(TEST_OBJS:.o=.dol))
 
 # What's a full build?
-all: $(LIB_DIR)/libSDL_mixer.a $(INCLUDE_DIR)/SDL_mixer.h install
+all: $(LIB_DIR)/libSDL_mixer.a $(INCLUDE_DIR)/SDL_mixer.h
 
 # How to install to SD card ready for running.
-install: $(TEST_DOLS)
+test-install: $(TEST_DOLS)
 	@-mkdir -p dols
 	cp $(TEST_DOLS) dols
 
@@ -53,7 +53,7 @@ clean:
 	@echo Cleaning $(LIB_DIR)/libSDL_mixer.a $(OBJ_DIR)
 	@rm -f $(LIB_DIR)/libSDL_mixer.a $(OBJS) $(TEST_OBJS)
 	
-lib-install:
+install:
 	@mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR)
 	@mkdir -p $(INSTALL_HEADER_DIR)/SDL
 	@cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR)
diff --git a/SDL_net/Makefile b/SDL_net/Makefile
index fe32fa8..7f59ba7 100644
--- a/SDL_net/Makefile
+++ b/SDL_net/Makefile
@@ -28,7 +28,7 @@ SRCS	:= $(wildcard $(SRC_DIR)/*.c)
 OBJS	:= $(subst $(SRC_DIR),$(OBJ_DIR),$(SRCS:.c=.o))
 
 # What's a full build?
-all: $(LIB_DIR)/libSDL_net.a
+all: $(LIB_DIR)/libSDL_net.a $(INCLUDE_DIR)/SDL_net.h
 
 # How to delete the intermediate files.
 clean:
@@ -36,8 +36,6 @@ clean:
 	@rm -f $(LIB_DIR)/libSDL_net.a $(OBJS) $(TEST_OBJS)
 	
 install:
-	
-lib-install:
 	@mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR)
 	@mkdir -p $(INSTALL_HEADER_DIR)/SDL
 	@cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR)
diff --git a/SDL_ttf/Makefile b/SDL_ttf/Makefile
index a832b42..1b6fc72 100644
--- a/SDL_ttf/Makefile
+++ b/SDL_ttf/Makefile
@@ -17,7 +17,7 @@ SRC_DIR			:= src
 INCLUDE_DIR		:= include
 TEST_OBJ_DIR		:= $(OBJ_DIR)/test
 TEST_SRC_DIR		:= src
-INSTALL_HEADER_DIR	?= $(DEVKITPRO)/libogc/include/
+INSTALL_HEADER_DIR	?= $(DEVKITPRO)/libogc/include
 INSTALL_LIB_DIR		?= $(DEVKITPRO)/libogc/lib/wii
 
 # Tools.
@@ -40,7 +40,7 @@ TEST_OBJS	:= $(subst $(TEST_SRC_DIR)/,$(TEST_OBJ_DIR)/,$(TEST_SRCS:.c=.o))
 TEST_DOLS	:= $(subst $(TEST_OBJ_DIR),$(BIN_DIR),$(TEST_OBJS:.o=.dol))
 
 # What's a full build?
-all: $(LIB_DIR)/libSDL_ttf.a $(INCLUDE_DIR)/SDL_ttf.h install
+all: $(LIB_DIR)/libSDL_ttf.a $(INCLUDE_DIR)/SDL_ttf.h
 
 # How to delete the intermediate files.
 clean:
@@ -48,11 +48,11 @@ clean:
 	@rm -f $(LIB_DIR)/libSDL_ttf.a $(OBJS) $(TEST_OBJS)
 
 # How to install to SD card ready for running.
-install: $(TEST_DOLS)
+test-install: $(TEST_DOLS)
 	@-mkdir -p dols
 	cp $(TEST_DOLS) dols
 	
-lib-install:
+install:
 	@mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR)
 	@mkdir -p $(INSTALL_HEADER_DIR)/SDL
 	@cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR)