7086639 X packages should have license file banners (fix license names in pkgs)
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 18 Jun 2012 19:30:15 -0700
changeset 1305 693dba88be96
parent 1304 abee56ecf6ff
child 1306 13bf30766f76
7086639 X packages should have license file banners (fix license names in pkgs)
open-src/common/Makefile.inc
--- a/open-src/common/Makefile.inc	Mon Jun 18 13:23:21 2012 -0700
+++ b/open-src/common/Makefile.inc	Mon Jun 18 19:30:15 2012 -0700
@@ -877,7 +877,7 @@
 $(LICENSE_FILE_DEFAULT)	LICENSE_FILE=COPYING
 
 # Default is the MIT/X11 license
-MIT_LICENSE_NAME = MIT License ($(MODULE_NAME))
+MIT_LICENSE_NAME = MIT License
 MIT_LICENSE_FILE = $(PKG_SRC_DIR)/license_files/lic_X11
 
 MODULE_LICENSE_DEFAULT		= $(MODULE_LICENSE_SET:yes=$(POUND_SIGN))
@@ -913,7 +913,7 @@
 ORACLE_LICENSE_NAME_open	= $(MIT_LICENSE_NAME)
 ORACLE_LICENSE_APPEND_open	= $(MIT_LICENSE_FILE)
 
-ORACLE_LICENSE_NAME_Oracle	= Oracle Copyright Notice ($(MODULE_NAME))
+ORACLE_LICENSE_NAME_Oracle	= Oracle Copyright Notice
 ORACLE_LICENSE_APPEND_Oracle 	= # Nothing to append to copyright notice
 
 ORACLE_LICENSE_NAME 		= $(ORACLE_LICENSE_NAME_$(LICENSE_CHOICE))
@@ -944,7 +944,7 @@
 	fi ; \
 	if [[ -n "$${license_to_copy}" ]] ; then \
 	    cat $(LICENSE_PREPEND) "$${license_to_copy}" $(LICENSE_APPEND) > "$@" ; \
-	    print 'license $(LICENSE_FILE_NAME) license="$(LICENSE_NAME)"' > "[email protected]" ; \
+	    print 'license $(LICENSE_FILE_NAME) license="$(LICENSE_NAME) ($(MODULE_NAME))"' > "[email protected]" ; \
 	fi
 
 install_metadata: $(METADATA_TARGETS)