nvramtool:

* Add OSX/Darwin support
* Add $DESTDIR support
* Clean up make install/spec

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4622 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile
index f07ed7e9438bb25bf2080d0677c28dbe4e010203..752e106da84ab1a80e03891a6642305a48b418a8 100644 (file)
--- a/util/nvramtool/Makefile
+++ b/util/nvramtool/Makefile
@@ -18,6 +18,11 @@ OBJS =  cmos_lowlevel.o cmos_ops.o common.o compute_ip_checksum.o \
        hexdump.o input_file.o layout.o layout_file.o lbtable.o   \
        nvramtool.o opts.o reg_expr.o
 
+OS_ARCH        = $(shell uname)
+ifeq ($(OS_ARCH), Darwin)
+LDFLAGS = -framework DirectIO
+endif
+
 all: dep $(PROGRAM)
 
 $(PROGRAM): $(OBJS)
@@ -34,9 +39,10 @@ dep:
        @$(CC) -MM *.c > .dependencies
 
 install: $(PROGRAM)
-       $(INSTALL) $(PROGRAM) $(PREFIX)/sbin
-       mkdir -p $(PREFIX)/share/man/man1
-       $(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8
+       mkdir -p $(DESTDIR)$(PREFIX)/sbin
+       $(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
+       mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8
+       $(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
 
 .PHONY: all clean distclean dep
 

diff --git a/util/nvramtool/common.h b/util/nvramtool/common.h
index a247380bce053e72f23ece389870394675f6e7af..c8ea92a5885ab13169cb2e828be69d333d8742ce 100644 (file)
--- a/util/nvramtool/common.h
+++ b/util/nvramtool/common.h
@@ -53,7 +53,12 @@
 #define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); })
 #define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); })
 #else
+#if defined(__GLIBC__)
 #include <sys/io.h>
+#endif
+#if (defined(__MACH__) && defined(__APPLE__))
+#include <DirectIO/darwinio.h>
+#endif
 #define OUTB outb
 #define OUTW outw
 #define OUTL outl

diff --git a/util/nvramtool/nvramtool.spec b/util/nvramtool/nvramtool.spec
index dcc23a9e2a70b24aca89fde5f90c73c14b2eccd4..2e3a4d067aa11dc9e891d3b5c8f7b9ef8e43d250 100644 (file)
--- a/util/nvramtool/nvramtool.spec
+++ b/util/nvramtool/nvramtool.spec
@@ -33,9 +33,9 @@ make
 %install
 rm -rf "$RPM_BUILD_ROOT"
 mkdir -p "$RPM_BUILD_ROOT/usr/bin"
-mkdir -p "$RPM_BUILD_ROOT/usr/man/man1"
+mkdir -p "$RPM_BUILD_ROOT/usr/man/man8"
 cp nvramtool "$RPM_BUILD_ROOT/usr/bin"
-cp nvramtool.1.gz $RPM_BUILD_ROOT/usr/man/man1
+cp nvramtool.8.gz $RPM_BUILD_ROOT/usr/man/man8
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
@@ -45,4 +45,4 @@ rm -rf "$RPM_BUILD_ROOT"
 %doc ChangeLog README
 %doc README
 /usr/bin/nvramtool
-/usr/man/man1/nvramtool.1.gz
+/usr/man/man8/nvramtool.8.gz