Branch HEAD

b=13285

revert the libexec patch since it hasn't got permissions yet.

diff --git a/lustre.spec.in b/lustre.spec.in
index e844ab7..36f7d46 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -138,7 +138,7 @@ cat >lustre.files <<EOF
 
 %attr(-, root, root) %{_mandir}/man?/*
 
-%attr(-, root, root) %{_libexecdir}/lustre/lc_common
+%attr(-, root, root) %{_libdir}/lustre/lc_common
 EOF
 
 if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then

diff --git a/lustre/scripts/Makefile.am b/lustre/scripts/Makefile.am
index 031a988..f0a44a3 100644 (file)
--- a/lustre/scripts/Makefile.am
+++ b/lustre/scripts/Makefile.am
@@ -15,7 +15,7 @@ EXTRA_DIST = license-status maketags.sh version_tag.pl.in lc_common \
             $(addsuffix .in,$(genscripts)) lc_mon $(sbinscripts) \
             $(bin_SCRIPTS)
 
-scriptlibdir = @libexecdir@/@PACKAGE@
+scriptlibdir = $(libdir)/@PACKAGE@
 scriptlib_DATA = lc_common
 
 CLEANFILES = $(genscripts)