Laurent Blume <[email protected]> writes:

> I will revert what you did, because as it happens, it conflicts with
> what *I* am working on.

How can this conflict with whatever you do? Maybe you're adding the
documentation in the recipe on which you are working on. Anyhow, here is
the patch, so you can have the courtesy to include it in the next
release:

--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile   2013-10-08 11:25:53 UTC 
(rev 22166)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile   2013-10-08 11:53:16 UTC 
(rev 22167)
@@ -168,6 +168,12 @@
 CHECKPKG_OVERRIDES_CSW$(NAME) += 
no-direct-binding|/opt/csw/libexec/sparcv9/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1
 CHECKPKG_OVERRIDES_CSW$(NAME) += 
no-direct-binding|/opt/csw/libexec/amd64/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1
 
+PACKAGES += CSW$(NAME)-doc
+CATALOGNAME_CSW$(NAME)-doc     =       $(NAME)_doc
+SPKG_DESC_CSW$(NAME)-doc       +=      $(DESCRIPTION), documentation
+PKGFILES_CSW$(NAME)-doc                +=      /opt/csw/share/info/mysql.info
+ARCHALL_CSW$(NAME)-doc         =       1
+
 # An example:
 # s9_preload.so.1|is|needed|by|/opt/csw/bin/innochecksum|but|never|used
 #CHECKPKG_OVERRIDES_CSW$(NAME) += soname-unused
@@ -347,6 +353,8 @@
                ln -s libmysqlclient.so.18 libmysqlclient_r.so.18)
        (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18.0.0; \
                ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0)
+       ginstall -m 755 -d $(DESTDIR)$(infodir)
+       ginstall -m 644 $(WORKSRC)/Docs/mysql.info $(DESTDIR)/$(infodir)
        @$(MAKECOOKIE)
 
 post-merge:

-- 
Peter

Reply via email to