diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-09-01 09:54:21 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-09-01 09:54:21 +0000 |
| commit | 4db6cbd26c2913549cd3d58c6943e766ccdc6c5e (patch) | |
| tree | 5b81d8deaf1ac0b5ab4cefef53e404a76c32ef1e | |
| parent | f7f2f258d8b44218c2efb83cfb276890fd4fb95c (diff) | |
| download | coreboot-4db6cbd26c2913549cd3d58c6943e766ccdc6c5e.tar.xz | |
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
| -rw-r--r-- | util/nvramtool/Makefile | 12 | ||||
| -rw-r--r-- | util/nvramtool/common.h | 5 | ||||
| -rw-r--r-- | util/nvramtool/nvramtool.spec | 6 |
3 files changed, 17 insertions, 6 deletions
diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile index f07ed7e943..752e106da8 100644 --- 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 a247380bce..c8ea92a588 100644 --- 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 dcc23a9e2a..2e3a4d067a 100644 --- 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 |