slurm-14.11.6: Fix hwloc support

diff --git a/slurm-14.11.6/Makefile b/slurm-14.11.6/Makefile
index af37bac3b1799652fd04064c85768d2d274f054b..ed4f182d7a3fe15bddef3c9707e91a626e9e17b3 100644 (file)
--- a/slurm-14.11.6/Makefile
+++ b/slurm-14.11.6/Makefile
@@ -19,6 +19,7 @@ USE_LIBTOOL=  yes
 
 # Fix installation:
 CONFIGURE_ARGS+=       --htmldir=$(PREFIX)/share/doc/$(PKGNAME_NOREV)/html
+CONFIGURE_ARGS+=       --with-hwloc=$(PREFIX)
 
 REPLACE_PYTHON=        doc/html/shtml2html.py
 
@@ -41,6 +42,7 @@ SUBST_SED.linuxinit=  -e 's|^exec_prefix=|&$(PREFIX)|' \
                        -e 's|@sysconfdir@|$${prefix}/etc|'
 
 post-install:
+       ${RM} -f ${WRKSRC}/etc/init.d.slurm.in.orig
        $(INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/examples/$(PKGBASE)
        $(INSTALL_DATA) $(WRKSRC)/etc/* $(DESTDIR)$(PREFIX)/share/examples/$(PKGBASE)/
        chmod 755 $(DESTDIR)$(PREFIX)/share/examples/slurm/init.d.slurm