rpms/superiotool/F-8 superiotool-Makefile_cleanup.diff, 1.2, 1.3 superiotool.spec, 1.8, 1.9

[Peter Lemenkov (peter)]

Author: peter

Update of /cvs/extras/rpms/superiotool/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5817/F-8

Modified Files:
	superiotool-Makefile_cleanup.diff superiotool.spec 
Log Message:
fixed installation

superiotool-Makefile_cleanup.diff:

Index: superiotool-Makefile_cleanup.diff
===================================================================
RCS file: /cvs/extras/rpms/superiotool/F-8/superiotool-Makefile_cleanup.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- superiotool-Makefile_cleanup.diff	18 Nov 2007 18:47:35 -0000	1.2
+++ superiotool-Makefile_cleanup.diff	18 May 2008 08:20:01 -0000	1.3
@@ -1,18 +1,31 @@
---- Makefile	2007-10-13 22:06:12.000000000 +0400
-+++ Makefile.new	2007-11-18 21:40:38.000000000 +0300
-@@ -24,15 +24,6 @@
+--- Makefile.Makefile_cleanup	2008-03-17 16:43:48.000000000 +0300
++++ Makefile	2008-05-18 12:10:51.000000000 +0400
+@@ -22,14 +22,14 @@
+ 
+ CC      = gcc
  INSTALL = /usr/bin/install
- PREFIX  = /usr/local
+-PREFIX  = /usr/local
++PREFIX  ?= /usr/local
+ 
+ # Set the superiotool version string from the highest revision number
+ # of the checked out superiotool files.
+ SVNDEF := -D'SUPERIOTOOL_VERSION="$(shell svnversion -cn . \
+           | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"'
  
--# Set the superiotool version string from the highest revision number
--# of the checked out superiotool files.
--SVNDEF := -D'SUPERIOTOOL_VERSION="$(shell svnversion -cn . \
--          | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"'
--
--# TODO: -pedantic
 -CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
--         -Werror-implicit-function-declaration -ansi $(SVNDEF)
--
++CFLAGS ?= -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
+          -Werror-implicit-function-declaration -ansi -pedantic $(SVNDEF)
+ 
  OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o
+@@ -42,9 +42,8 @@
+ 	$(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS)
+ 
+ install: $(PROGRAM)
+-	$(INSTALL) $(PROGRAM) $(PREFIX)/sbin
+-	mkdir -p $(PREFIX)/share/man/man8
+-	$(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8
++	$(INSTALL) -p -D $(PROGRAM) $(PREFIX)/sbin/$(PROGRAM)
++	$(INSTALL) -p -D -m 644 $(PROGRAM).8 $(PREFIX)/share/man/man8/$(PROGRAM).8
  
- all: $(PROGRAM)
+ clean:
+ 	rm -f $(PROGRAM) *.o


Index: superiotool.spec
===================================================================
RCS file: /cvs/extras/rpms/superiotool/F-8/superiotool.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- superiotool.spec	17 May 2008 20:18:40 -0000	1.8
+++ superiotool.spec	18 May 2008 08:20:01 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	Simple program for detecting Super I/O on your mainboard
 Name:		superiotool
 Version:	0
-Release:	0.10.20080518svn3319%{?dist}
+Release:	0.11.20080518svn3319%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 # svn -r 3319 export svn://linuxbios.org/repos/trunk/util/superiotool superiotool
@@ -15,8 +15,8 @@
 ExcludeArch:	ppc ppc64
 
 %description
-User-space helper tool which allows you to detect which Super I/O you have 
-on your mainboard, and it can provide detailed information about the register 
+User-space helper tool which allows you to detect which Super I/O you have
+on your mainboard, and it can provide detailed information about the register
 contents of the Super I/O.
 
 %prep
@@ -28,9 +28,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -p %{name} $RPM_BUILD_ROOT%{_bindir}
-install -D -p -m644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+make PREFIX=$RPM_BUILD_ROOT/usr install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,10 +36,13 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_bindir}/%{name}
+%{_sbindir}/%{name}
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Sun May 18 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.11.20080518svn3319
+- Fixed installation
+
 * Sun May 18 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.10.20080518svn3319
 - Add support for dumping ITE IT8718F EC registers
 - Detect SMSC SCH5027