--- ./Makefile.orig	2009-05-19 12:51:11.000000000 -0400
+++ ./Makefile	2014-06-27 04:03:52.000000000 -0400
@@ -74,7 +74,7 @@
 #
 .PHONY: all platform-check check-gw6c-pal check-gw6c-config check-gw6c-messaging build-gw6c check-gw6c-install install clean cleanall
 
-all: platform-check check-gw6c-pal check-gw6c-config check-gw6c-messaging build-gw6c
+all: platform-check check-gw6c-config check-gw6c-messaging build-gw6c
 
 
 # This makefile target will check the platform.
@@ -117,7 +117,7 @@
 # This makefile target will check and build the Gateway6 Client Configuration
 # Subsystem if it is not built.
 #
-check-gw6c-config:
+check-gw6c-config:	check-gw6c-pal
 	@[ -d ${GW6CCFG_DIR} ] || { \
 	    echo "Gateway6 Client Configuration Subsystem module is not found. (${GW6CCFG_DIR})"; \
 	    exit 1 ; \
@@ -131,7 +131,7 @@
 # This makefile target will check and build the Gateway6 Client Messaging
 # Subsystem if it is not built.
 #
-check-gw6c-messaging:
+check-gw6c-messaging:	check-gw6c-pal
 	@[ -d ${GW6CMSG_DIR} ] || { \
 	    echo "Gateway6 Client Messaging Subsystem module is not found. (${GW6CMSG_DIR})"; \
 	    exit 1 ; \
@@ -144,7 +144,7 @@
 
 # This makefile target will build the Gateway6 Client.
 #
-build-gw6c:
+build-gw6c:	check-gw6c-pal
 	mkdir -p $(OBJS_DIR)
 	mkdir -p $(BIN_DIR)
 	@for dir in ${SUBDIRS}; do \
@@ -167,17 +167,14 @@
 	@mkdir -p $(INSTALL_DIR)
 	@mkdir -p $(INSTALL_BIN)
 	@mkdir -p $(INSTALL_MAN)
-	@mkdir -p $(INSTALL_TEMPL)
 
 	@for dir in ${SUBDIRS}; do \
 	    $(MAKE) -C $$dir install || exit 1; \
 	done
 
-	@cp $(TARGET) $(INSTALL_BIN)
-	@cp $(BIN_DIR)/gw6c.conf.sample $(INSTALL_BIN)
-	@[ -f $(INSTALL_BIN)/gw6c.conf ] || { \
-	    cp $(INSTALL_BIN)/gw6c.conf.sample $(INSTALL_BIN)/gw6c.conf; \
-	}
+	${BSD_INSTALL_PROGRAM} $(TARGET) $(INSTALL_BIN)
+	@mkdir -p $(DESTDIR)$(ETCDIR)
+	${BSD_INSTALL_DATA} $(BIN_DIR)/gw6c.conf.sample $(DESTDIR)$(ETCDIR)
 
 
 # This makefile target will clean the build tree of the Gateway6 Client.