Minor changes to build for Solaris packages

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@459 f882894a-f735-0410-b71e-b25c423dba1c

4 files changed, 13 insertions, 7 deletions

diff --git a/Makefile.am b/Makefile.am
index 8cc15144..5e117a5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,17 +18,18 @@ nagios-plugins.spec: nagios-plugins.spec.in
         sed "s/%%{VER}/${VER}/;s/%%{REL}/${REL}/;" $? > $@
 
 # Solaris pkgmk
-BUILDDIR=`pwd`/build-solaris
-PACKDIR=`pwd`/build-pkg
+BUILDDIR := $(shell pwd)/build-solaris
+PACKDIR := $(shell pwd)/build-pkg
+PKGSCRIPT := $(shell pwd)/pkg/solaris/solpkg
 VERSION=@PACKAGE_VERSION@
 
 solpkg:
         if [ ! -d $(BUILDDIR) ] ; then mkdir $(BUILDDIR); fi
         if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
         $(MAKE) all
-        $(MAKE) DESTDIR=$(BUILDDIR) install
+        $(MAKE) DESTDIR=$(BUILDDIR) prefix=/ install
         $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
-        $(cd $(BUILDDIR) && `pwd`/pkg/solaris/solpkg $(PACKDIR))
+        cd $(BUILDDIR) && $(PERL) $(PKGSCRIPT) $(PACKDIR)
 
 pkgclean:
         rm -rf $(BUILDDIR) $(PACKDIR)
diff --git a/pkg/solaris/.cvsignore b/pkg/solaris/.cvsignore
new file mode 100644
index 00000000..a6bb7e4c
--- /dev/null
+++ b/pkg/solaris/.cvsignore
@@ -0,0 +1,2 @@
+.cvsignore
+pkginfo
diff --git a/pkg/solaris/pkginfo.in b/pkg/solaris/pkginfo.in
index be4b97fa..9211fcf8 100644
--- a/pkg/solaris/pkginfo.in
+++ b/pkg/solaris/pkginfo.in
@@ -1,12 +1,12 @@
-PKG="NPDTplugins"
-NAME="nagiosplugins"
+PKG="NAGplugin"
+NAME="nagios-plugins"
 DESC="Nagios network monitoring plugins"
 ARCH="@PKG_ARCH@"
 VERSION="@PACKAGE_VERSION@,REV=@REV_DATESTAMP@"
 CATEGORY="application"
 VENDOR="Nagios Plugin Development Team"
 EMAIL="nagiosplug-devel@lists.sourceforge.net"
-PSTAMP="sfw@REV_TIMESTAMP@"
+PSTAMP="nag@REV_TIMESTAMP@"
 BASEDIR="/usr/local"
 CLASSES="none"
 
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index a7dd5cce..347c4c77 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -64,6 +64,9 @@ const char *options = "\
 #include <stdarg.h>
 #include "../lib/fsusage.h"
 #include "../lib/mountlist.h"
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
 
 /* If nonzero, show inode information. */
 static int inode_format;