slurm-14.11.6: Fix hwloc support

[Jason Bacon <jwbacon%tds.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <jwbacon%tds.net@localhost>
Pushed By:	outpaddling
Date:		Fri Jun 3 12:07:45 2016 -0500
Changeset:	5cd612899f824b327f8513da964ab0dfd3fb21b7

Modified Files:
	slurm-14.11.6/Makefile

Log Message:
slurm-14.11.6: Fix hwloc support

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5cd612899f824b327f8513da964ab0dfd3fb21b7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 slurm-14.11.6/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diffs:
diff --git a/slurm-14.11.6/Makefile b/slurm-14.11.6/Makefile
index af37bac..ed4f182 100644
--- 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