diff options
| author | Mark J. Nelson <Mark.J.Nelson@Oracle.COM> | 2010-08-02 16:37:22 -0600 |
|---|---|---|
| committer | Mark J. Nelson <Mark.J.Nelson@Oracle.COM> | 2010-08-02 16:37:22 -0600 |
| commit | 5084e753b79a753c8b532c06eb3ad1d025e8e472 (patch) | |
| tree | 6a7792aca858a5f5f6e128cb86945b60d18680be /usr/src/Makefile | |
| parent | b86b270c836df59ddb475186e3e649d300906882 (diff) | |
| download | illumos-joyent-5084e753b79a753c8b532c06eb3ad1d025e8e472.tar.gz | |
6929502 packages are missing some license files
6930656 license action improvements
--HG--
rename : usr/src/cmd/cmd-inet/usr.bin/pppdump/LICENSE.top.descrip => usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE.descrip
rename : usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE => usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd
rename : usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.descrip => usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd.descrip
rename : usr/src/pkg/license_files/lic_SUNWroute => usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd
rename : usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.descrip => usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd.descrip
rename : usr/src/pkg/license_files/lic_SUNWhwdata => usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids.tmpl
rename : usr/src/pkg/license_files/lic_GPLv2 => usr/src/cmd/powertop/common/COPYING
rename : usr/src/lib/librstp/THIRDPARTYLICENSE.descrip => usr/src/lib/librstp/common/COPYING.descrip
rename : usr/src/uts/common/io/e1000g/README => usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE
rename : usr/src/pkg/license_files/lic_Emulex => usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE
rename : usr/src/pkg/license_files/lic_Qlogic => usr/src/uts/common/io/fibre-channel/fca/qlc/FIRMWARELICENSE
rename : usr/src/uts/common/io/ib/clients/of/lic_of => usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE
rename : usr/src/uts/common/io/ib/clients/of/lic_of.descrip => usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE.descrip
rename : usr/src/pkg/license_files/cr_Intel.SUNWfipe => usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE
Diffstat (limited to 'usr/src/Makefile')
| -rw-r--r-- | usr/src/Makefile | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index ceaf93a7a7..3322c85431 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -92,10 +92,25 @@ check := TARGET= check all: mapfiles closedbins sgs .WAIT $(SUBDIRS) pkg -install: install1 install2 _msg +# +# The _msg build is a two-step process. First, the _msg dependency +# causes recursive makes in $(MSGSUBDIRS), which stages raw message +# files in $(ROOT)/catalog. Second, the action from the install +# target rule causes those messages to be post-processed from where +# they were staged in $(ROOT)/catalog, and the results placed into the +# proto area. +# +# The stage-licenses target causes the license files needed for +# packaging to be pulled from $(SRC) and $(CLOSED) and staged in +# $(ROOT)/licenses. +# +install: install1 install2 _msg stage-licenses @cd msg; pwd; $(MAKE) _msg @rm -rf "$(ROOT)/catalog" +stage-licenses: install2 + @cd pkg; pwd; $(MAKE) stage-licenses + install1: mapfiles closedbins sgs install2: install1 $(SUBDIRS) |