From 18aa85857ca8fa9d75d41c36665a1cb7e8bbda5c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 8 Jan 2011 19:56:21 +0100
Subject: variable name cleanup

---
 tools/adk/Makefile     | 13 ++++++-------
 tools/cpio/Makefile    |  4 ++--
 tools/mkcrypt/Makefile |  6 +++---
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'tools')

diff --git a/tools/adk/Makefile b/tools/adk/Makefile
index 1f8c2186e..638935e5e 100644
--- a/tools/adk/Makefile
+++ b/tools/adk/Makefile
@@ -5,16 +5,15 @@ include $(TOPDIR)/rules.mk
 
 CCANDLD.c=	${HOSTCC} ${HOSTCFLAGS} ${HOSTCPPFLAGS} ${HOSTLDFLAGS}
 
-${TOPDIR}/bin/tools/depmaker:
-	${CCANDLD.c} -o $(TOPDIR)/bin/tools/depmaker depmaker.c
+${TOOLS_DIR}/depmaker:
+	${CCANDLD.c} -Wall -o $@ depmaker.c
 
-${TOPDIR}/bin/tools/pkgrebuild:
-	${CCANDLD.c} -o $(TOPDIR)/bin/tools/pkgrebuild pkgrebuild.c strmap.c
+${TOOLS_DIR}/pkgrebuild:
+	${CCANDLD.c} -Wall -o $@ pkgrebuild.c strmap.c
 
-${TOPDIR}/bin/tools/dkgetsz:
+${TOOLS_DIR}/dkgetsz:
 	${CCANDLD.c} -Wall -o $@ dkgetsz.c
 
-install: ${TOPDIR}/bin/tools/depmaker ${TOPDIR}/bin/tools/pkgrebuild \
-	${TOPDIR}/bin/tools/dkgetsz
+install: ${TOOLS_DIR}/depmaker ${TOOLS_DIR}/pkgrebuild ${TOOLS_DIR}/dkgetsz
 
 include $(TOPDIR)/mk/tools.mk
diff --git a/tools/cpio/Makefile b/tools/cpio/Makefile
index bbf138918..a012c43a5 100644
--- a/tools/cpio/Makefile
+++ b/tools/cpio/Makefile
@@ -27,9 +27,9 @@ SRCS+=		\
 		src/nonpax.c \
 		src/cpio.c
 
-${TOPDIR}/bin/tools/cpio: ${SRCS}
+${TOOLS_DIR}/cpio: ${SRCS}
 	${HOSTCC} ${HOSTCFLAGS} -D_GNU_SOURCE -Isrc -o $@ $^
 
-install: ${TOPDIR}/bin/tools/cpio
+install: ${TOOLS_DIR}/cpio
 
 include $(TOPDIR)/mk/tools.mk
diff --git a/tools/mkcrypt/Makefile b/tools/mkcrypt/Makefile
index 54548c39e..1708f9f13 100644
--- a/tools/mkcrypt/Makefile
+++ b/tools/mkcrypt/Makefile
@@ -3,9 +3,9 @@
 
 include $(TOPDIR)/rules.mk
 
-${TOPDIR}/bin/tools/mkcrypt:
-	$(HOSTCC) ${HOSTCFLAGS} -o $(TOPDIR)/bin/tools/mkcrypt mkcrypt.c
+${TOOLS_DIR}/mkcrypt:
+	$(HOSTCC) ${HOSTCFLAGS} -o $@ mkcrypt.c
 
-install: ${TOPDIR}/bin/tools/mkcrypt
+install: ${TOOLS_DIR}/mkcrypt
 
 include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3