From: Ton Voon <tonvoon@users.sourceforge.net>
Date: Wed, 14 May 2003 21:39:48 +0000 (+0000)
Subject: Remove dependency on gnu make
X-Git-Url: https://git.tokkee.org/?p=nagiosplug.git;a=commitdiff_plain;h=7abe670895f8c4921c93d518ccb56170cdc33629

Remove dependency on gnu make


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

diff --git a/Makefile.am b/Makefile.am
index 760d8e7..02514aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,19 +18,17 @@ nagios-plugins.spec: nagios-plugins.spec.in
 	sed "s/%%{VER}/${VER}/;s/%%{REL}/${REL}/;" $? > $@
 
 # Solaris pkgmk
-BUILDDIR := $(shell pwd)/build-solaris
-PACKDIR := $(shell pwd)/build-pkg
-PKGSCRIPT := $(shell pwd)/pkg/solaris/solpkg
-PKGPFX := $(shell echo ${prefix} |sed -e 's@^/usr/local@@')
-VERSION=@PACKAGE_VERSION@
+BUILDDIR = build-solaris
+PACKDIR = build-pkg
+PKGSCRIPT = pkg/solaris/solpkg
 
 solpkg:
 	if [ ! -d $(BUILDDIR) ] ; then mkdir $(BUILDDIR); fi
 	if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
 	$(MAKE) all
-	$(MAKE) DESTDIR=$(BUILDDIR) prefix=$(PKGPFX) install
+	$(MAKE) DESTDIR=$$PWD/$(BUILDDIR) install
 	$(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
-	cd $(BUILDDIR) && $(PERL) $(PKGSCRIPT) $(PACKDIR)
+	cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
 
 pkgclean:
 	rm -rf $(BUILDDIR) $(PACKDIR)
diff --git a/pkg/solaris/pkginfo.in b/pkg/solaris/pkginfo.in
index 9211fcf..c9dcced 100644
--- a/pkg/solaris/pkginfo.in
+++ b/pkg/solaris/pkginfo.in
@@ -7,6 +7,6 @@ CATEGORY="application"
 VENDOR="Nagios Plugin Development Team"
 EMAIL="nagiosplug-devel@lists.sourceforge.net"
 PSTAMP="nag@REV_TIMESTAMP@"
-BASEDIR="/usr/local"
+BASEDIR="/"
 CLASSES="none"
 
diff --git a/pkg/solaris/solpkg b/pkg/solaris/solpkg
index 0b82bce..00846d0 100755
--- a/pkg/solaris/solpkg
+++ b/pkg/solaris/solpkg
@@ -18,7 +18,7 @@ if ($pwd =~ '\/usr\/local') {
 die  "Wrong location, please cd to <PKGBASE>/usr/local/ and run again.\n"
         if ($pwd eq "");
 
-open (PREPROTO,"$find . -print |$pkgproto |") ||
+open (PREPROTO,"$find . -print |$egrep -v \"^.(/usr(/local)|/opt)?\$\" | $pkgproto |") ||
 	die "Unable to read prototype information ($!)\n";
 open (PROTO,">$prototype") ||
 	die "Unable to write file prototype ($!)\n";