summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.cvsignore2
-rw-r--r--Makefile.am3
2 files changed, 3 insertions, 2 deletions
diff --git a/.cvsignore b/.cvsignore
index f2464d45..44de11e9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,7 +9,7 @@ command.cfg
9Cache.pm 9Cache.pm
10build-* 10build-*
11aclocal.m4 11aclocal.m4
12autom4te-*.cache 12autom4te*.cache
13install-sh 13install-sh
14mkinstalldirs 14mkinstalldirs
15missing 15missing
diff --git a/Makefile.am b/Makefile.am
index 5e117a5d..760d8e79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,13 +21,14 @@ nagios-plugins.spec: nagios-plugins.spec.in
21BUILDDIR := $(shell pwd)/build-solaris 21BUILDDIR := $(shell pwd)/build-solaris
22PACKDIR := $(shell pwd)/build-pkg 22PACKDIR := $(shell pwd)/build-pkg
23PKGSCRIPT := $(shell pwd)/pkg/solaris/solpkg 23PKGSCRIPT := $(shell pwd)/pkg/solaris/solpkg
24PKGPFX := $(shell echo ${prefix} |sed -e 's@^/usr/local@@')
24VERSION=@PACKAGE_VERSION@ 25VERSION=@PACKAGE_VERSION@
25 26
26solpkg: 27solpkg:
27 if [ ! -d $(BUILDDIR) ] ; then mkdir $(BUILDDIR); fi 28 if [ ! -d $(BUILDDIR) ] ; then mkdir $(BUILDDIR); fi
28 if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi 29 if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
29 $(MAKE) all 30 $(MAKE) all
30 $(MAKE) DESTDIR=$(BUILDDIR) prefix=/ install 31 $(MAKE) DESTDIR=$(BUILDDIR) prefix=$(PKGPFX) install
31 $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR) 32 $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
32 cd $(BUILDDIR) && $(PERL) $(PKGSCRIPT) $(PACKDIR) 33 cd $(BUILDDIR) && $(PERL) $(PKGSCRIPT) $(PACKDIR)
33 34