diff options
| author | Gordon Ross <gwr@nexenta.com> | 2016-10-09 12:44:00 -0400 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2016-10-12 14:26:37 -0400 |
| commit | 3f49b3936533b156931d49d2ef1b81bf412d9af0 (patch) | |
| tree | 1af83f260953ea9fa0226e582fb1a04d0602a6d6 | |
| parent | e8b0c41026dbb486662d23eebf7d9dff012b93f9 (diff) | |
| download | illumos-gfx-drm-3f49b3936533b156931d49d2ef1b81bf412d9af0.tar.gz | |
Fix Makefile, myenv
| -rw-r--r-- | myenv.sh | 4 | ||||
| -rw-r--r-- | usr/src/Makefile | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -76,8 +76,7 @@ export MAILTO="$STAFFER" # specified, the build is simply run in a new task in the current project. export BUILD_PROJECT= -# You should not need to change the next four lines -export LOCKNAME="$(basename "$CODEMGR_WS")_nightly.lock" +# You should not need to change the next three lines export ATLOG="$CODEMGR_WS/log" export LOGFILE="$ATLOG/nightly.log" export MACH="$(uname -p)" @@ -181,3 +180,4 @@ ONBLD_BIN="${ONBLD_TOOLS}/bin" # POST_NIGHTLY can be any command to be run at the end of nightly. See # nightly(1) for interactions between environment variables and this command. #POST_NIGHTLY= + diff --git a/usr/src/Makefile b/usr/src/Makefile index 831a862..6825c3f 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -96,13 +96,13 @@ all: sgs .WAIT $(SUBDIRS) pkg # $(ROOT)/licenses. # install: install1 install2 _msg stage-licenses - @cd msg; pwd; $(MAKE) _msg - @rm -rf "$(ROOT)/catalog" +# @cd msg; pwd; $(MAKE) _msg +# @rm -rf "$(ROOT)/catalog" stage-licenses: install2 @cd pkg; pwd; $(MAKE) stage-licenses -install1: mapfiles closedbins sgs +install1: sgs install2: install1 $(SUBDIRS) |