Wed Jan 25 15:40:58 2012 Michael Jennings (mej)

Convert to autoconf/automake for build.
----------------------------------------------------------------------

Author: Michael Jennings

ChangeLog

@@ -170,3 +170,7 @@ Output onlining/offlining of nodes to log (with timestamp).
 
 Log failure of health check to logfile as well as syslog.
 ----------------------------------------------------------------------
+Wed Jan 25 15:40:58 2012                        Michael Jennings (mej)
+
+Convert to autoconf/automake for build.
+----------------------------------------------------------------------

Makefile.am

@@ -0,0 +1,17 @@
+# $Id$
+
+AUTOMAKE_OPTIONS = foreign
+
+helperdir = $(libexecdir)/nhc
+confdir = $(sysconfdir)/nhc
+
+dist_sbin_SCRIPTS = nhc
+dist_conf_DATA = nhc.conf
+nobase_dist_conf_DATA = scripts/common.nhc scripts/ww_fs.nhc \
+    scripts/ww_hw.nhc scripts/ww_job.nhc scripts/ww_ps.nhc
+dist_helper_SCRIPTS = helpers/node-mark-online helpers/node-mark-offline
+
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure install-sh missing
+DISTCLEANFILES = 
+CLEANFILES = 
+EXTRA_DIST = ChangeLog autogen.sh warewulf-nhc.spec

autogen.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if autoreconf -V >/dev/null 2>&1 ; then
+    set -x
+    autoreconf -f -i
+else
+    set -x
+    aclocal
+    autoconf
+    automake -ca -Wno-portability
+fi
+
+if [ -z "$NO_CONFIGURE" ]; then
+   ./configure $@
+fi
+

configure.in

@@ -0,0 +1,13 @@
+dnl# $Id$
+
+AC_PREREQ(2.59)
+AC_INIT([warewulf-nhc], [1.1.3], [warewulf-devel@lbl.gov])
+AC_CONFIG_SRCDIR([.])
+
+AC_PROG_INSTALL
+AM_INIT_AUTOMAKE([foreign])
+
+AC_OUTPUT([
+   Makefile
+   warewulf-nhc.spec
+])

prod.mezz

@@ -5,13 +5,14 @@
 %{!?nhc_helper_dir:%global nhc_helper_dir %{_libexecdir}/%{sname}}
 
 Summary: Warewulf Node Health Check System
-Name: warewulf-%{sname}
-Version: 1.1.3
-Release: %{_rel}
+Name: @PACKAGE@
+Version: @VERSION@
+#Release: %{_rel}
+Release: 1
 License: BSD
 Group: Applications/System
 URL: http://warewulf.lbl.gov/
-Source: %{name}.tar.gz
+Source: %{name}-%{version}.tar.gz
 Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@lbl.gov>}
 Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:Warewulf Project (http://warewulf.lbl.gov/)}
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
@@ -30,22 +31,24 @@ contained in this package provide a flexible, extensible mechanism for
 collecting health checks to be run on your cluster and specifying
 which checks should be run on which nodes.
 
+
 %prep
-%setup -n %{name} -T -c -a 0
+%setup
+
+
+%build
+%{configure}
+%{__make} %{?mflags}
+
 
 %install
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_sysconfdir}/%{sname}
-%{__mkdir_p} $RPM_BUILD_ROOT%{nhc_script_dir} $RPM_BUILD_ROOT%{nhc_helper_dir}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT %{?mflags_install}
 
-%{__install} -m 0755 nhc $RPM_BUILD_ROOT%{_sbindir}/%{sname}
-#%{__install} -m 0755 nhc-run $RPM_BUILD_ROOT%{_sbindir}/
-%{__install} -m 0644 nhc.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{sname}/%{sname}.conf
-%{__install} -m 0644 scripts/* $RPM_BUILD_ROOT%{nhc_script_dir}/
-%{__install} -m 0755 helpers/* $RPM_BUILD_ROOT%{nhc_helper_dir}/
 
 %clean
 test "$RPM_BUILD_ROOT" != "/" && %{__rm} -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-, root, root)
 %dir %{_sysconfdir}/%{sname}/