iozone/iozone-3_373.diff

   1 diff -Naur src~/current/COPYING src/current/COPYING
   2 --- src~/current/COPYING        1969-12-31 18:00:00.000000000 -0600
   3 +++ src/current/COPYING 2009-10-31 09:42:05.000000000 -0500
   4 @@ -0,0 +1,19 @@
   5 +      Original Author: William Norcott (wnorcott@us.oracle.com)
   6 +              4 Dunlap Drive
   7 +              Nashua, NH 03060
   8 +
   9 +      Enhancements: Don Capps (capps@iozone.org)
  10 +                 7417 Crenshaw
  11 +                 Plano, TX 75025
  12 +
  13 + Copyright 1991, 1992, 1994, 1998, 1999, 2002   William D. Norcott
  14 +
  15 + License to freely use and distribute this software is hereby granted
  16 + by the author, subject to the condition that this copyright notice
  17 + remains intact.  The author retains the exclusive right to publish
  18 + derivative works based on this work, including, but not limited to,
  19 + revised versions of this work
  20 +
  21 + Other contributors:
  22 +
  23 + Don Capps       (Network Appliance)   capps@iozone.org
  24 diff -Naur src~/current/makefile src/current/makefile
  25 --- src~/current/makefile       2010-06-24 20:22:56.000000000 -0500
  26 +++ src/current/makefile        2010-06-24 20:24:34.000000000 -0500
  27 @@ -19,6 +19,15 @@
  28  S10CCFLAGS     = -m64
  29  FLAG64BIT      = -m64
  30
  31 +BINS   = iozone fileop Generate_Graphs gengnuplot.sh gnu3d.dem
  32 +
  33 +BINDIR = /usr/bin
  34 +MANDIR = /usr/share/man
  35 +DOCDIR = /usr/share/doc/iozone
  36 +COPYDIR        = /usr/share/licenses/iozone
  37 +
  38 +DESTDIR        =
  39 +
  40  all:
  41         @echo ""
  42         @echo "You must specify the target.        "
  43 @@ -42,11 +52,11 @@
  44         @echo "        ->   hpux_no_ansi-10.1    (32bit)   <-"
  45         @echo "        ->   IRIX                 (32bit)   <-"
  46         @echo "        ->   IRIX64               (64bit)   <-"
  47 -       @echo "        ->   linux                (32bit)   <-"
  48 +       @echo "        ->   linux-i686           (32bit)   <-"
  49         @echo "        ->   linux-arm            (32bit)   <-"
  50 -       @echo "        ->   linux-AMD64          (64bit)   <-"
  51 +       @echo "        ->   linux-x86_64         (64bit)   <-"
  52         @echo "        ->   linux-ia64           (64bit)   <-"
  53 -       @echo "        ->   linux-powerpc        (32bit)   <-"
  54 +       @echo "        ->   linux-ppc            (32bit)   <-"
  55         @echo "        ->   linux-powerpc64      (64bit)   <-"
  56         @echo "        ->   linux-sparc          (32bit)   <-"
  57         @echo "        ->   macosx               (32bit)   <-"
  58 @@ -158,7 +168,7 @@
  59  #
  60  # GNU 'C' compiler Linux build with threads, largefiles, async I/O
  61  #
  62 -linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o
  63 +linux-i686:    iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o
  64         $(CC)  -O3 $(LDFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \
  65                 -lrt -o iozone
  66         $(CC)  -O3 -Dlinux fileop_linux.o -o fileop
  67 @@ -167,7 +177,7 @@
  68  #
  69  # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O
  70  #
  71 -linux-powerpc: iozone_linux-powerpc.o  libbif.o libasync.o fileop_linux-ppc.o pit_server.o
  72 +linux-ppc: iozone_linux-powerpc.o  libbif.o libasync.o fileop_linux-ppc.o pit_server.o
  73         $(CC) -O3 $(LDFLAGS) iozone_linux-powerpc.o libasync.o \
  74                 libbif.o -lpthread  -lrt -o iozone
  75         $(CC)  -O3 -Dlinux fileop_linux-ppc.o -o fileop
  76 @@ -213,7 +223,7 @@
  77  #
  78  # GNU 'C' compiler Linux build with threads, largefiles, async I/O
  79  #
  80 -linux-AMD64:   iozone_linux-AMD64.o  libbif.o libasync.o fileop_linux-AMD64.o pit_server.o
  81 +linux-x86_64:  iozone_linux-AMD64.o  libbif.o libasync.o fileop_linux-AMD64.o pit_server.o
  82         $(CC)  -O3 $(LDFLAGS) iozone_linux-AMD64.o libbif.o libasync.o \
  83                 -lrt -lpthread -o iozone
  84         $(CC)  -O3 -Dlinux fileop_linux-AMD64.o -o fileop
  85 @@ -1333,3 +1343,11 @@
  86                 -DNAME='"netbsd"' -DSHARED_MEM $(CFLAGS) iozone.c -o iozone_netbsd.o
  87         $(CC) -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \
  88                 -DSHARED_MEM $(CFLAGS) libbif.c -o libbif.o
  89 +
  90 +install:
  91 +       install -dm755 $(DESTDIR)$(BINDIR)
  92 +       install -Dm755 $(BINS) $(DESTDIR)$(BINDIR)
  93 +       install -Dm644 ../../docs/iozone.1 $(DESTDIR)$(MANDIR)/man1/iozone.1
  94 +       install -Dm644 ../../docs/Run_rules.doc $(DESTDIR)$(DOCDIR)/Guidelines.doc
  95 +       install -Dm644 Gnuplot.txt $(DESTDIR)$(DOCDIR)/Generate_Graphs.txt
  96 +       install -Dm644 COPYING $(DESTDIR)$(COPYDIR)/COPYING