- change PACKAGE to lustre

- update spec

diff --git a/lustre/configure.in b/lustre/configure.in
index 41c5502..7431e7f 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -7,7 +7,7 @@ AC_CANONICAL_SYSTEM
 # See the file COPYING in this distribution
 
 # Automake variables.  Steal the version number from lustre.spec.in.
-AM_INIT_AUTOMAKE(obd, builtin([esyscmd], [sed -ne '/^%define version /{ s/.*version //; p; q; }' scripts/lustre.spec.in]))
+AM_INIT_AUTOMAKE(lustre, builtin([esyscmd], [sed -ne '/^%define version /{ s/.*version //; p; q; }' scripts/lustre.spec.in]))
 #AM_MAINTAINER_MODE
 AC_PROG_CC
 AC_PROG_RANLIB

diff --git a/lustre/obdecho/echo.c b/lustre/obdecho/echo.c
index 2c7bbc5..27c189a 100644 (file)
--- a/lustre/obdecho/echo.c
+++ b/lustre/obdecho/echo.c
@@ -11,6 +11,9 @@
  * by Peter Braam <braam@clusterfs.com>
  */
 
+static char rcsid[] __attribute ((unused)) = "$Id: echo.c,v 1.17 2002/07/05 20:05:27 rread Exp $";
+#define OBDECHO_VERSION "$Revision: 1.17 $"
+
 #define EXPORT_SYMTAB
 
 #include <linux/version.h>
@@ -185,8 +188,6 @@ struct obd_ops echo_obd_ops = {
         o_commitrw:    echo_commitrw,
 };
 
-#define OBDECHO_VERSION "$Revision: 1.16 $"
-
 static int __init obdecho_init(void)
 {
         printk(KERN_INFO "Echo OBD driver " OBDECHO_VERSION " info@clusterfs.com\n");

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index 3585e58..b5810f4 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -1,4 +1,4 @@
-# obd.spec
+# lustre.spec
 %define version 0.3.2.1
 %define kversion @RELEASE@
 %define linuxdir @LINUX@
@@ -12,7 +12,7 @@ Copyright: GPL
 Group: Utilities/System
 Requires: lustre-modules, libxml2
 BuildRoot: /var/tmp/obd-%{version}-root
-Source: ftp://ftp.lustre.com/pub/lustre/obd-%{version}.tar.gz
+Source: ftp://ftp.lustre.com/pub/lustre/lustre-%{version}.tar.gz
 
 %description
 The Lustre Lite Cluster File System: kernel drivers for file system,
@@ -34,7 +34,7 @@ Group: Development/Kernel
 Lustre Lite Source for further development
 
 %prep
-%setup -n obd-%{version}
+%setup -n lustre-%{version}
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -55,7 +55,7 @@ find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/obd-%{version}
 
 %files
 %attr(-, root, root) %doc COPYING FDL
-%attr(-, root, root) %doc doc/master.pdf doc/lustre-HOWTO.txt
+%attr(-, root, root) %doc doc/lustre.pdf doc/lustre-HOWTO.txt
 %attr(-, root, root) /usr/sbin/obdctl
 %attr(-, root, root) /usr/sbin/lctl
 %attr(-, root, root) /usr/sbin/llsetup.sh

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index d2947f1..68c2ce8 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -3,8 +3,8 @@ CPPFLAGS := -I. -I$(PORTALS)/include -I$(top_srcdir)/include -D_LARGEFILE64_SOUR
 CFLAGS := -g -Wall
 # LDADD = -lldap
 # LDADD := -lreadline -ltermcap # -lefence
-pkglibdir = @libdir@/lustre
-pkgcfgdir = @sysconfdir@/lustre
+pkglibdir = @libdir@/$(PACKAGE)
+pkgcfgdir = @sysconfdir@/$(PACKAGE)
 EXTRA_DIST = llsetup.sh llrsetup.sh llcleanup.sh common.sh lustre.cfg
 sbin_SCRIPTS = llsetup.sh llrsetup.sh llcleanup.sh
 pkglib_SCRIPTS = common.sh