SF.net SVN: gar:[24936] csw/mgar/pkg/lang-java/jss/branches/fromfedora/ Makefile

[cgrzemba at users.sourceforge.net]

Revision: 24936
          http://sourceforge.net/p/gar/code/24936
Author:   cgrzemba
Date:     2015-05-06 07:15:23 +0000 (Wed, 06 May 2015)
Log Message:
-----------
lang-java/jss/branches/fromfedora: reorg package content, add jss4.jar for 64bit

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile

Modified: csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-06 06:07:53 UTC (rev 24935)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-06 07:15:23 UTC (rev 24936)
@@ -60,6 +60,7 @@
 PATCHFILES += 0025-jss-support-TLS1_1-TLS1_2.patch
 PATCHFILES += 0026-SunOS5.mk.patch
 
+MERGE_INCLUDE_FILES += $(datadir)/java/64/jss4.jar
 PACKAGES += CSWjss4
 CATALOGNAME_CSWjss4 = jss4
 SPKG_DESC_CSWjss4 += $(DESCRIPTION), jss4.jar, libjss4.so
@@ -74,11 +75,9 @@
 CHECKPKG_OVERRIDES_CSWjss4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libjss4.so|soname=libjss4.so|pkgname=CSWjss4|expected=CSWlibjss4
 CHECKPKG_OVERRIDES_CSWjss4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libjss4.so|soname=libjss4.so|pkgname=CSWjss4|expected=CSWlibjss4
 
-
-
 PACKAGES += CSWjss4-doc
 CATALOGNAME_CSWjss4-doc = jss4_doc
-PKGFILES_CSWjss4-doc = $(PKGFILES_DOC)
+PKGFILES_CSWjss4-doc = $(call baseisadirs,$(datadir)/jssdoc,.*)
 SPKG_DESC_CSWjss4-doc += $(DESCRIPTION), javadoc
 ARCHALL_CSWjss4-doc = 1
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.