diff --git a/Makefile.am b/Makefile.am
index d8122c99365dc8f61c12e794979619f140ad135a..14c42cc9c97443197a276bd440a3a56b220605fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,8 @@ EXTRA_DIST = \
etc/slurm.conf.example \
etc/slurmdbd.conf.example \
etc/slurm.epilog.clean \
- etc/init.d.slurm \
- etc/init.d.slurmdbd \
+ etc/init.d.slurm.in \
+ etc/init.d.slurmdbd.in \
etc/cgroup.conf.example \
etc/cgroup.release_common.example \
etc/cgroup_allowed_devices_file.conf.example \
@@ -31,7 +31,7 @@ EXTRA_DIST = \
pkginclude_HEADERS = \
slurm/pmi.h \
slurm/slurm.h \
- slurm/slurmdb.h \
+ slurm/slurmdb.h \
slurm/slurm_errno.h \
slurm/spank.h
diff --git a/Makefile.in b/Makefile.in
index 91b5ef5c909ddece34d8c80bfaf5a18bc5caba79..8f04d40af71d3d39f3a5e3c2fce87130453dd814 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,6 +43,8 @@ DIST_COMMON = $(am__configure_deps) $(pkginclude_HEADERS) \
$(top_srcdir)/contribs/perlapi/libslurm/perl/Makefile.PL.in \
$(top_srcdir)/contribs/perlapi/libslurmdb/perl/Makefile.PL.in \
$(top_srcdir)/contribs/phpext/slurm_php/config.m4.in \
+ $(top_srcdir)/etc/init.d.slurm.in \
+ $(top_srcdir)/etc/init.d.slurmdbd.in \
$(top_srcdir)/slurm/slurm.h.in AUTHORS COPYING ChangeLog \
INSTALL NEWS
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -93,7 +95,8 @@ CONFIG_HEADER = config.h $(top_builddir)/slurm/slurm.h
CONFIG_CLEAN_FILES = config.xml \
contribs/perlapi/libslurm/perl/Makefile.PL \
contribs/perlapi/libslurmdb/perl/Makefile.PL \
- contribs/phpext/slurm_php/config.m4
+ contribs/phpext/slurm_php/config.m4 etc/init.d.slurm \
+ etc/init.d.slurmdbd
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
@@ -391,8 +394,8 @@ EXTRA_DIST = \
etc/slurm.conf.example \
etc/slurmdbd.conf.example \
etc/slurm.epilog.clean \
- etc/init.d.slurm \
- etc/init.d.slurmdbd \
+ etc/init.d.slurm.in \
+ etc/init.d.slurmdbd.in \
etc/cgroup.conf.example \
etc/cgroup.release_common.example \
etc/cgroup_allowed_devices_file.conf.example \
@@ -413,7 +416,7 @@ EXTRA_DIST = \
pkginclude_HEADERS = \
slurm/pmi.h \
slurm/slurm.h \
- slurm/slurmdb.h \
+ slurm/slurmdb.h \
slurm/slurm_errno.h \
slurm/spank.h
@@ -493,6 +496,10 @@ contribs/perlapi/libslurmdb/perl/Makefile.PL: $(top_builddir)/config.status $(to
cd $(top_builddir) && $(SHELL) ./config.status $@
contribs/phpext/slurm_php/config.m4: $(top_builddir)/config.status $(top_srcdir)/contribs/phpext/slurm_php/config.m4.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+etc/init.d.slurm: $(top_builddir)/config.status $(top_srcdir)/etc/init.d.slurm.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+etc/init.d.slurmdbd: $(top_builddir)/config.status $(top_srcdir)/etc/init.d.slurmdbd.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
diff --git a/configure b/configure
index 69c8296a7274232d9ee89ca8e9639bb11e1322b1..8f29b33cd5f9c9521f9fe4a30a925f8bb8648665 100755
--- a/configure
+++ b/configure
@@ -22350,7 +22350,7 @@ fi
-ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile contribs/Makefile contribs/arrayrun/Makefile contribs/cray/Makefile contribs/lua/Makefile contribs/pam/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/torque/Makefile contribs/phpext/Makefile contribs/phpext/slurm_php/config.m4 contribs/sjobexit/Makefile contribs/slurmdb-direct/Makefile src/Makefile src/api/Makefile src/common/Makefile src/db_api/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/sstat/Makefile src/sshare/Makefile src/salloc/Makefile src/sbatch/Makefile src/sattach/Makefile src/sdiag/Makefile src/sprio/Makefile src/srun/Makefile src/srun_cr/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/pgsql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/checkpoint/blcr/Makefile src/plugins/checkpoint/blcr/cr_checkpoint.sh src/plugins/checkpoint/blcr/cr_restart.sh src/plugins/crypto/Makefile src/plugins/crypto/munge/Makefile src/plugins/crypto/openssl/Makefile src/plugins/gres/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/aix/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/pgsql/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/cnode/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/rms/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/proctrack/lua/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/ba/Makefile src/plugins/select/bluegene/ba_bgq/Makefile src/plugins/select/bluegene/bl/Makefile src/plugins/select/bluegene/bl_bgq/Makefile src/plugins/select/bluegene/sfree/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cray/Makefile src/plugins/select/cray/libalps/Makefile src/plugins/select/cray/libemulate/Makefile src/plugins/select/linear/Makefile src/plugins/switch/Makefile src/plugins/switch/elan/Makefile src/plugins/switch/none/Makefile src/plugins/switch/federation/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mpichmx/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile"
+ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile contribs/Makefile contribs/arrayrun/Makefile contribs/cray/Makefile contribs/lua/Makefile contribs/pam/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/torque/Makefile contribs/phpext/Makefile contribs/phpext/slurm_php/config.m4 contribs/sjobexit/Makefile contribs/slurmdb-direct/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html etc/init.d.slurm etc/init.d.slurmdbd src/Makefile src/api/Makefile src/common/Makefile src/db_api/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/sstat/Makefile src/sshare/Makefile src/salloc/Makefile src/sbatch/Makefile src/sattach/Makefile src/sdiag/Makefile src/sprio/Makefile src/srun/Makefile src/srun_cr/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/pgsql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/checkpoint/blcr/Makefile src/plugins/checkpoint/blcr/cr_checkpoint.sh src/plugins/checkpoint/blcr/cr_restart.sh src/plugins/crypto/Makefile src/plugins/crypto/munge/Makefile src/plugins/crypto/openssl/Makefile src/plugins/gres/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/aix/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/pgsql/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/cnode/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/rms/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/proctrack/lua/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/ba/Makefile src/plugins/select/bluegene/ba_bgq/Makefile src/plugins/select/bluegene/bl/Makefile src/plugins/select/bluegene/bl_bgq/Makefile src/plugins/select/bluegene/sfree/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cray/Makefile src/plugins/select/cray/libalps/Makefile src/plugins/select/cray/libemulate/Makefile src/plugins/select/linear/Makefile src/plugins/switch/Makefile src/plugins/switch/elan/Makefile src/plugins/switch/none/Makefile src/plugins/switch/federation/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mpichmx/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile"
cat >confcache <<\_ACEOF
@@ -23640,6 +23640,17 @@ do
"contribs/phpext/slurm_php/config.m4") CONFIG_FILES="$CONFIG_FILES contribs/phpext/slurm_php/config.m4" ;;
"contribs/sjobexit/Makefile") CONFIG_FILES="$CONFIG_FILES contribs/sjobexit/Makefile" ;;
"contribs/slurmdb-direct/Makefile") CONFIG_FILES="$CONFIG_FILES contribs/slurmdb-direct/Makefile" ;;
+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
+ "doc/man/man1/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/man1/Makefile" ;;
+ "doc/man/man3/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/man3/Makefile" ;;
+ "doc/man/man5/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/man5/Makefile" ;;
+ "doc/man/man8/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/man8/Makefile" ;;
+ "doc/html/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/Makefile" ;;
+ "doc/html/configurator.html") CONFIG_FILES="$CONFIG_FILES doc/html/configurator.html" ;;
+ "doc/html/configurator.easy.html") CONFIG_FILES="$CONFIG_FILES doc/html/configurator.easy.html" ;;
+ "etc/init.d.slurm") CONFIG_FILES="$CONFIG_FILES etc/init.d.slurm" ;;
+ "etc/init.d.slurmdbd") CONFIG_FILES="$CONFIG_FILES etc/init.d.slurmdbd" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/api/Makefile") CONFIG_FILES="$CONFIG_FILES src/api/Makefile" ;;
"src/common/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/Makefile" ;;
@@ -23769,15 +23780,6 @@ do
"src/plugins/topology/node_rank/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/topology/node_rank/Makefile" ;;
"src/plugins/topology/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/topology/none/Makefile" ;;
"src/plugins/topology/tree/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/topology/tree/Makefile" ;;
- "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
- "doc/man/man1/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/man1/Makefile" ;;
- "doc/man/man3/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/man3/Makefile" ;;
- "doc/man/man5/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/man5/Makefile" ;;
- "doc/man/man8/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/man8/Makefile" ;;
- "doc/html/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/Makefile" ;;
- "doc/html/configurator.html") CONFIG_FILES="$CONFIG_FILES doc/html/configurator.html" ;;
- "doc/html/configurator.easy.html") CONFIG_FILES="$CONFIG_FILES doc/html/configurator.easy.html" ;;
"testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
"testsuite/expect/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/expect/Makefile" ;;
"testsuite/slurm_unit/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/slurm_unit/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 88e50e3a27811418427acaf6f11e6b93fb61cb1f..a925e5f610e4f58d8e6882f957de75076da4cbe2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -415,6 +415,17 @@ AC_CONFIG_FILES([Makefile
contribs/phpext/slurm_php/config.m4
contribs/sjobexit/Makefile
contribs/slurmdb-direct/Makefile
+ doc/Makefile
+ doc/man/Makefile
+ doc/man/man1/Makefile
+ doc/man/man3/Makefile
+ doc/man/man5/Makefile
+ doc/man/man8/Makefile
+ doc/html/Makefile
+ doc/html/configurator.html
+ doc/html/configurator.easy.html
+ etc/init.d.slurm
+ etc/init.d.slurmdbd
src/Makefile
src/api/Makefile
src/common/Makefile
@@ -544,15 +555,6 @@ AC_CONFIG_FILES([Makefile
src/plugins/topology/node_rank/Makefile
src/plugins/topology/none/Makefile
src/plugins/topology/tree/Makefile
- doc/Makefile
- doc/man/Makefile
- doc/man/man1/Makefile
- doc/man/man3/Makefile
- doc/man/man5/Makefile
- doc/man/man8/Makefile
- doc/html/Makefile
- doc/html/configurator.html
- doc/html/configurator.easy.html
testsuite/Makefile
testsuite/expect/Makefile
testsuite/slurm_unit/Makefile
diff --git a/etc/init.d.slurm b/etc/init.d.slurm.in
similarity index 98%
rename from etc/init.d.slurm
rename to etc/init.d.slurm.in
index c3ace6009ecc6d4b90ab81eada01346771998745..ec5d534fa42092ed0217fc07549412cfb507597a 100644
--- a/etc/init.d.slurm
+++ b/etc/init.d.slurm.in
@@ -25,10 +25,10 @@
# Description: Start slurm to provide resource management
### END INIT INFO
-BINDIR=/usr/bin
-CONFDIR=/etc/slurm
-LIBDIR=/usr/lib
-SBINDIR=/usr/sbin
+BINDIR="@bindir@"
+CONFDIR="@sysconfdir@"
+LIBDIR="@libdir@"
+SBINDIR="@sbindir@"
# Source function library.
if [ -f /etc/rc.status ]; then
diff --git a/etc/init.d.slurmdbd b/etc/init.d.slurmdbd.in
similarity index 98%
rename from etc/init.d.slurmdbd
rename to etc/init.d.slurmdbd.in
index 3ea4b510c31f95676f776cfa16c691ce058086c3..62ecf8a04eeb2a5287f8fd942e5e1db021efbf53 100755
--- a/etc/init.d.slurmdbd
+++ b/etc/init.d.slurmdbd.in
@@ -21,9 +21,9 @@
# Description: Start slurm to provide database server for SLURM
### END INIT INFO
-CONFDIR=/etc/slurm
-SBINDIR=/usr/sbin
-LIBDIR=/usr/lib
+CONFDIR="@sysconfdir@"
+LIBDIR="@libdir@"
+SBINDIR="@sbindir@"
#Source function library.
if [ -f /etc/rc.status ]; then