From 55f6c66a77ef0d80dc5136853cc9d7cc85f18478 Mon Sep 17 00:00:00 2001
From: Mark Grondona <mgrondona@llnl.gov>
Date: Tue, 25 Mar 2003 00:33:12 +0000
Subject: [PATCH] o Makefile.am : include META o slurm.spec.in : fix bug in
--with debug o doc/man/man1/srun.1 : --kill-off was renamed to --no-kill
---
Makefile.am | 3 ++-
doc/man/man1/srun.1 | 2 +-
slurm.spec.in | 18 ++++++------------
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c94861a7997..12c06a2b08a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,8 @@ EXTRA_DIST = \
AUTHORS \
INSTALL \
NEWS \
- ChangeLog
+ ChangeLog \
+ META
slurmincludedir=$(includedir)/slurm
slurminclude_HEADERS = \
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index e472fb8a178..93d8586d30d 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -71,7 +71,7 @@ available. By default, \fB\-\-immediate\fR is off, and
.B srun
will block until resources become available.
.TP
-\fB\-k\fR, \fB\-\-kill-off\fR
+\fB\-k\fR, \fB\-\-no-kill\fR
Do not automatically terminate a job of one of the nodes it has been allocated
fails. The job will assume all responsibilities for fault-tolerance. The
default action is to terminate the job upon node failure.
diff --git a/slurm.spec.in b/slurm.spec.in
index ad1846c512d..1b0f29391f4 100644
--- a/slurm.spec.in
+++ b/slurm.spec.in
@@ -25,7 +25,6 @@ Requires: openssl >= 0.9.6
%if %{?_with_debug:1}%{!?_with_debug:0}
%define _enable_debug --enable-debug
%define __os_install_post /usr/lib/rpm/brp-compress
- CFLAGS="-g -Wall"
%endif
#
@@ -80,17 +79,12 @@ SLURM authentication module for Chris Dunlap's Munge
%setup -n %{name}-%{version}-%{release}
%build
-PFX_FIX=--program-prefix=%{?_program_prefix:%{_program_prefix}}
-WITHCONF=--sysconfdir=/etc/slurm
-
-# for now we build with debugging symbols
-
-%configure \
- $PFX_FIX $WITHCONF \
- %{?_enable_debug} \
- %{?_with_elan} \
- %{?_without_elan} \
- %{?_with_totalview} \
+%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
+ --sysconfdir=/etc/slurm \
+ %{?_enable_debug} \
+ %{?_with_elan} \
+ %{?_without_elan} \
+ %{?_with_totalview} \
%{?_without_totalview}
#
--
GitLab