[csw-devel] SF.net SVN: gar:[13604] csw/mgar/pkg/puppet/trunk/Makefile

[Maciej Bliziński]

2011/3/6  <phipsy at users.sourceforge.net>:
> Revision: 13604
>          http://gar.svn.sourceforge.net/gar/?rev=13604&view=rev
> Author:   phipsy
> Date:     2011-03-06 18:09:10 +0000 (Sun, 06 Mar 2011)
>
> Log Message:
> -----------
> Work on puppet
>
> Modified Paths:
> --------------
>    csw/mgar/pkg/puppet/trunk/Makefile
>
> Modified: csw/mgar/pkg/puppet/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/puppet/trunk/Makefile  2011-03-06 15:57:15 UTC (rev 13603)
> +++ csw/mgar/pkg/puppet/trunk/Makefile  2011-03-06 18:09:10 UTC (rev 13604)
> @@ -7,7 +7,7 @@
>  # [1] http://garylaw.net/packages/puppet-build.sh
>
>  NAME = puppet
> -VERSION = 2.6.5
> +VERSION = 2.6.4
>  CATEGORIES = apps
>
>  define BLURB
> @@ -32,6 +32,8 @@
>
>  INITSMF += $(sysconfdir)/init\.d/cswpuppetd
>  INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd
> +#MANIFEST /var${prefix}/svc/manifest/network/puppetd.xml
> +#MANIFEST /var${prefix}/svc/manifest/network/puppetmaster.xml
>  USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup
>
>  # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster
> @@ -51,6 +53,7 @@
>  PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd
>  PKGFILES_CSWpuppetmaster += $(mandir)/man8/puppetmasterd.8
>  PKGFILES_CSWpuppetmaster += $(libdir)/.*/puppet/application/puppetmasterd.rb
> +PKGFILES_CSWpuppetmaster += /var${prefix}/svc/manifest/network/puppetmaster.xml

I think you mean $(prefix), not ${prefix}.  The former is GNU make
syntax, the latter is shell syntax.

Generally, you can define localstatedir as /var$(prefix) and use
$(localstatedir) instead.  That is also the best option for
autotools-driven projects.

>  ARCHALL = 1
>
> @@ -67,6 +70,7 @@
>  PATCHFILES += 0003-Use-opt-csw-share-puppet-modules-as-default.patch
>
>  CHECKPKG_OVERRIDES_CSWpuppet       += surplus-dependency|CSWfacter
> +CHECKPKG_OVERRIDES_CSWpuppet += missing-dependency|CSWpython
>  CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet
>
>  # CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs
> @@ -83,10 +87,6 @@
>        ginstall -m 755 -d $(DESTDIR)
>        ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet
>        ginstall -m 755 -d $(DESTDIR)$(localstatedir)/puppet/run
> -       ginstall -m 755 -d $(DESTDIR)$(CRONDIR)
> -       ginstall -m 644 \
> -               $(FILEDIR)/CSWpuppet.cron.root \
> -               $(DESTDIR)$(CRONDIR)/root

Can you leave the cron job as an option?