diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-06-28 15:50:43 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-06-28 15:50:43 +0300 |
| commit | 28e6eebf54f40a2ff820c996698c720b1a898266 (patch) | |
| tree | c4008ddc8d12d5faef869cae06d73dc81585efe7 | |
| parent | b6648dea882b755e747d7d6be7a2355a9f28b6ae (diff) | |
| parent | 37c74fbdf19d42b07515f0e8370e462a328ae366 (diff) | |
Merge branch 'pks-makefile-silence-comments' into 'master'
Makefile: Silence comments in NOTICE target
See merge request gitlab-org/gitaly!3597
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -381,9 +381,9 @@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE ${BUILD_DIR}/NOTICE: ${GO_LICENSES} clean-ruby-vendor-go ${Q}rm -rf ${BUILD_DIR}/licenses ${Q}GOOS=linux GOFLAGS="-tags=${GO_BUILD_TAGS}" ${GO_LICENSES} save ./... --save_path=${BUILD_DIR}/licenses - # some projects may be copied from the Go module cache - # (GOPATH/pkg/mod) and retain strict permissions (444). These - # permissions are not desirable when removing and rebuilding: + ${Q}# some projects may be copied from the Go module cache + ${Q}# (GOPATH/pkg/mod) and retain strict permissions (444). These + ${Q}# permissions are not desirable when removing and rebuilding: ${Q}find ${BUILD_DIR}/licenses -type d -exec chmod 0755 {} \; ${Q}find ${BUILD_DIR}/licenses -type f -exec chmod 0644 {} \; ${Q}go run ${SOURCE_DIR}/_support/noticegen/noticegen.go -source ${BUILD_DIR}/licenses -template ${SOURCE_DIR}/_support/noticegen/notice.template > ${BUILD_DIR}/NOTICE |