diff options
-rw-r--r-- | .cvsignore | 2 | ||||
-rw-r--r-- | Makefile.am | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -9,7 +9,7 @@ command.cfg Cache.pm build-* aclocal.m4 -autom4te-*.cache +autom4te*.cache install-sh mkinstalldirs missing 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 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@ solpkg: if [ ! -d $(BUILDDIR) ] ; then mkdir $(BUILDDIR); fi if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi $(MAKE) all - $(MAKE) DESTDIR=$(BUILDDIR) prefix=/ install + $(MAKE) DESTDIR=$(BUILDDIR) prefix=$(PKGPFX) install $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR) cd $(BUILDDIR) && $(PERL) $(PKGSCRIPT) $(PACKDIR) |