PORTALS=$enable_portalsdir
AC_SUBST(PORTALS)
-portalslib_def='$(top_srcdir)/../portals'
AC_ARG_WITH(portalslib, [ --with-portalslib=[path] set path to Portals library (default=../portals/linux/utils)], enable_portalslib=$withval)
-AC_ARG_ENABLE(portalslib, [ --enable-portalslib=[path] (deprecated) set path to Portals lib (default=../portals/linux/utils)],, enable_portalslib=$portalslib_def)
-PORTALSLIB=$enable_portalslib/linux/utils
+AC_ARG_ENABLE(portalslib, [ --enable-portalslib=[path] (deprecated) set path to Portals lib (default=../portals/linux/utils)],, enable_portalslib='')
+if test -z "$enable_portalslib"; then
+ PORTALSLIB=${PORTALS}/linux/utils
+else
+ PORTALSLIB=${enable_portalslib}
+fi
AC_SUBST(PORTALSLIB)
AC_MSG_CHECKING(if make dep has been run in kernel source)
%define kversion @RELEASE@
%define linuxdir @LINUX@
%define portalsdir @PORTALS@
+%define portalslibdir @PORTALSLIB@
Release: 0208282230chaos
Summary: Lustre Lite File System
rm -rf $RPM_BUILD_ROOT
# Set an explicit path to our Linux tree, if we can.
-./configure --enable-linuxdir='%{linuxdir}' --enable-portalsdir='%{portalsdir}'
+./configure --with-linux='%{linuxdir}' --with-portals='%{portalsdir}' --with-portalslib='%{portalslibdir}'
make
%install
%attr(-, root, root) /usr/sbin/lmc
%attr(-, root, root) /usr/sbin/lctl
%attr(-, root, root) /usr/sbin/lconf
-%attr(-, root, root) /usr/sbin/llsetup.sh
-%attr(-, root, root) /usr/sbin/llrsetup.sh
-%attr(-, root, root) /usr/sbin/llcleanup.sh
-%attr(-, root, root) /lib/lustre/common.sh
-%attr(-, root, root) /etc/lustre/lustre.cfg
+%attr(-, root, root) /usr/lib/lustre/examples/llmount.sh
+%attr(-, root, root) /usr/lib/lustre/examples/llmountcleanup.sh
+%attr(-, root, root) /usr/lib/lustre/examples/llecho.sh
+%attr(-, root, root) /usr/lib/lustre/examples/local.sh
+%attr(-, root, root) /usr/lib/lustre/examples/uml.sh
+%attr(-, root, root) /usr/lib/lustre/examples/lov.sh
%attr(-, root, root) /etc/init.d/lustre
%files -n lustre-doc
CFLAGS := -g -Wall
# LDADD = -lldap
# LDADD := -lreadline -ltermcap # -lefence
-pkglibdir = @libdir@/$(PACKAGE)
-pkgcfgdir = @sysconfdir@/$(PACKAGE)
-EXTRA_DIST = $(sbin_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) \
+EXTRA_DIST = $(pkgexample_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) \
common.sh lustre.cfg \
client-echo.cfg elan-server.cfg net-client.cfg obdecho.cfg \
client-mount.cfg ldlm.cfg net-local.cfg obdfilter.cfg \
client-mount2.cfg lustre.cfg net-server.cfg \
elan-client.cfg mds.cfg trivial.sh
-sbin_SCRIPTS = llsetup.sh llrsetup.sh llcleanup.sh
-noinst_DATA = ext2_10000.gz ext2_25000.gz ext3_10000.gz lov.xml
+pkgexampledir = '${exec_prefix}/usr/lib/$(PACKAGE)/examples'
+pkgexample_SCRIPTS = llmount.sh llmountcleanup.sh llecho.sh local.sh uml.sh lov.sh
+noinst_SCRIPTS = llsetup.sh llrsetup.sh llcleanup.sh
+noinst_DATA = ext2_10000.gz ext2_25000.gz ext3_10000.gz lov.xml lustre.cfg
noinst_SCRIPTS = fs.sh intent-test.sh intent-test2.sh leak_finder.pl \
lldlm.sh llecho.sh llext3.sh llmodules.sh llmount-client.sh \
llmount-server.sh llmount.sh llmountcleanup.sh llrext3.sh \
llrmount.sh llsimple.sh mdcreq.sh mdcreqcleanup.sh \
ostreq.sh runfailure-client-mds-recover.sh runfailure-mds \
runfailure-net runfailure-ost runiozone runregression-net.sh \
- runtests runvmstat snaprun.sh tbox.sh
-pkglib_SCRIPTS = common.sh
-pkgcfg_DATA = lustre.cfg
+ runtests runvmstat snaprun.sh tbox.sh common.sh
noinst_PROGRAMS = openunlink testreq truncate directio openme writeme mcreate
noinst_PROGRAMS += munlink tchmod toexcl fsx test_brw openclose createdestroy
noinst_PROGRAMS += lovstripe # ldaptest