From 8907c2164e691ce2f10b4365138bcaada9d99d30 Mon Sep 17 00:00:00 2001
From: jce <jce@unknown>
Date: Fri, 31 Jan 2003 18:33:07 +0000
Subject: [PATCH] *** empty log message ***
---
Makefile.am | 10 ++++++++--
configure.ac | 1 -
slurm.spec.in | 16 ++++++----------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 6671f76bfc1..c58ffe987de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = slurm src testsuite doc
+SUBDIRS = src testsuite doc
EXTRA_DIST = \
etc/slurm.conf.example \
@@ -13,12 +13,18 @@ EXTRA_DIST = \
README \
DISCLAIMER \
COPYING \
- META
+ META \
+ slurm
+
+nobase_include_HEADERS = \
+ slurm/slurm.h \
+ slurm/slurm_errno.h
MAINTAINERCLEANFILES = \
aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \
ltconfig ltmain.sh missing mkinstalldirs \
+ slurm/slurm.h \
stamp-h.in
include $(top_srcdir)/Make-rpm.mk
diff --git a/configure.ac b/configure.ac
index 5a76d09beee..9bdb4ad5968 100644
--- a/configure.ac
+++ b/configure.ac
@@ -453,7 +453,6 @@ AC_DEFINE(WITH_LSD_NOMEM_ERROR_FUNC, 1, [Have definition of lsd_nomem_error()])
dnl All slurm Makefiles:
AC_CONFIG_FILES([Makefile
- slurm/Makefile
src/Makefile
src/api/Makefile
src/common/Makefile
diff --git a/slurm.spec.in b/slurm.spec.in
index 09bb772478c..f82756f47ef 100644
--- a/slurm.spec.in
+++ b/slurm.spec.in
@@ -61,24 +61,19 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%doc README
%doc DISCLAIMER
-%doc COPYIN
-%attr(755, root, root) %{_bindir}/scancel
-%attr(755, root, root) %{_bindir}/scontrol
-%attr(755, root, root) %{_bindir}/sinfo
-%attr(755, root, root) %{_bindir}/squeue
-%attr(755, root, root) %{_bindir}/srun
-%attr(755, root, root) %{_sbindir}/slurmctld
-%attr(755, root, root) %{_sbindir}/slurmd
+%doc COPYING
+%attr(755, root, root) %{_bindir}/*
+%attr(755, root, root) %{_sbindir}/*
%config(noreplace) %attr(755, root, root) /etc/rc.d/init.d/slurm
%config(noreplace) %attr(755, root, root) /etc/slurm.conf
-%{_libdir}/*.so
+%{_libdir}/*.so*
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_mandir}/man8/*
%files devel
%defattr(-,root,root)
-%{_prefix}/include/slurm.h
+%{_prefix}/include/slurm/*
%{_libdir}/libslurm.a
%{_libdir}/libslurm.la
%{_mandir}/man3/*
@@ -91,6 +86,7 @@ if [ -x /etc/rc.d/init.d/slurm ]; then
fi
%post
+ldconfig %{_libdir}
if [ -x /etc/rc.d/init.d/slurm ]; then
[ -x /sbin/chkconfig ] && /sbin/chkconfig --del slurm
[ -x /sbin/chkconfig ] && /sbin/chkconfig --add slurm
--
GitLab