Merge branch 'master' of ssh://nagiosplug.git.sourceforge.net/gitroot/nagiosplug/nagiosplug

1 files changed, 3 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index b6e5f2e..cbca5d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\"
 
 dist-hook:
-        make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
+        $(MAKE) THANKS
         echo ${VERSION} >$(distdir)/release
 
 install-root:
@@ -28,13 +28,6 @@ test test-debug:
         cd plugins && $(MAKE) $@
         cd plugins-scripts && $(MAKE) $@
 
-nagios-plugins.spec: nagios-plugins.spec.in
-        sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@
-
-pkg/fedora/nagios-plugins.spec: nagios-plugins.spec.in
-        $(top_srcdir)/mkinstalldirs pkg/fedora
-        sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;/^# Requires$$/r $(top_srcdir)/pkg/fedora/requires" $? > $@
-
 # Solaris pkgmk
 BUILDDIR = build-solaris
 PACKDIR = build-pkg
@@ -45,7 +38,9 @@ solpkg:
         if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
         $(MAKE) all
         $(MAKE) DESTDIR=$$PWD/$(BUILDDIR) install
+        $(INSTALL) plugins-root/pst3 $(BUILDDIR)$(libexecdir)
         $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
+        $(INSTALL) pkg/solaris/preinstall $(BUILDDIR)
         cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
 
 THANKS: THANKS.in