2 files changed, 64 insertions, 3 deletions
diff --git a/tools/build/src/Makefile.in b/tools/build/src/Makefile.in
new file mode 100644
index 0000000000..f6c3135d54
--- /dev/null
+++ b/tools/build/src/Makefile.in
@@ -0,0 +1,61 @@
+#
+# $Id$
+#
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH=@srcdir@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
+manext = 1
+mandir = @mandir@/man$(manext)
+
+
+VPATH=@srcdir@
+
+
+# we use host compiler in this directory
+USE_HOST_COMPILER=yes
+
+# C source names, if any, go here -- minus the .c
+C_PIECES=cklength eolstrip packhex unhex
+C_FILES=$(C_PIECES:%=%.c)
+C_O_FILES=$(C_PIECES:%=$(ARCH)/%.o)
+
+H_FILES=
+
+SRCS=$(C_FILES) $(CC_FILES) $(H_FILES)
+OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
+
+PGMS=$(ARCH)/cklength $(ARCH)/eolstrip $(ARCH)/packhex $(ARCH)/unhex
+
+include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+DEFINES  +=
+CPPFLAGS +=
+CFLAGS   +=
+
+LD_PATHS  +=
+LD_LIBS   +=
+LDFLAGS   +=
+
+#
+# Add your list of files to delete here.  The config files
+#  already know how to delete some stuff, so you may want
+#  to just run 'make clean' first to see what gets missed.
+#  'make clobber' already includes 'make clean'
+#
+
+CLEAN_ADDITIONS += $(HOST_ARCH)
+CLOBBER_ADDITIONS +=
+
+all:	$(ARCH) $(SRCS) $(PGMS)
+	$(INSTALL_VARIANT) -m 555 $(PGMS) ${PROJECT_RELEASE}/build-tools
diff --git a/tools/build/src/unhex.c b/tools/build/src/unhex.c
index 14e51a885c..a75ba8e665 100644
--- a/tools/build/src/unhex.c
+++ b/tools/build/src/unhex.c
@@ -88,10 +88,10 @@ void error(int errn, ...);
 #define ERR_ABORT  (ERR_ERRNO / 4)              /* error is fatal; abort */
 #define ERR_MASK   (ERR_ERRNO | ERR_FATAL | ERR_ABORT) /* all */
 
-#if (defined(sparc) && (sunos < 500))
-#define stol(p) strtol(p, (char **) NULL, 0)            /* Sunos */
+#ifdef HAVE_STRTOUL
+#define stol(p) strtoul(p, (char **) NULL, 0)
 #else
-#define stol(p) strtoul(p, (char **) NULL, 0)           /* Solaris */
+#define stol(p) strtol(p, (char **) NULL, 0)
 #endif
  
 int   unhex(FILE *ifp, char *inm, FILE *ofp, char *onm);