1 files changed, 5 insertions, 4 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)