[v2] r4622 - trunk/util/nvramtool

Author: stepan
Date: 2009-09-01 11:54:21 +0200 (Tue, 01 Sep 2009)
New Revision: 4622

Modified:
   trunk/util/nvramtool/Makefile
   trunk/util/nvramtool/common.h
   trunk/util/nvramtool/nvramtool.spec
Log:

nvramtool:

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

Signed-off-by: Stefan Reinauer 
Acked-by: Peter Stuge

Modified: trunk/util/nvramtool/Makefile
===================================================================
--- trunk/util/nvramtool/Makefile	2009-09-01 09:52:14 UTC (rev 4621)
+++ trunk/util/nvramtool/Makefile	2009-09-01 09:54:21 UTC (rev 4622)
@@ -18,6 +18,11 @@
    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 @@
    @$(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

Modified: trunk/util/nvramtool/common.h
===================================================================
--- trunk/util/nvramtool/common.h	2009-09-01 09:52:14 UTC (rev 4621)
+++ trunk/util/nvramtool/common.h	2009-09-01 09:54:21 UTC (rev 4622)
@@ -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

Modified: trunk/util/nvramtool/nvramtool.spec
===================================================================
--- trunk/util/nvramtool/nvramtool.spec	2009-09-01 09:52:14 UTC (rev 4621)
+++ trunk/util/nvramtool/nvramtool.spec	2009-09-01 09:54:21 UTC (rev 4622)
@@ -33,9 +33,9 @@
 %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 @@
 %doc ChangeLog README
 %doc README
 /usr/bin/nvramtool
-/usr/man/man1/nvramtool.1.gz
+/usr/man/man8/nvramtool.8.gz