github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29016 from thockin/fix-makefile-line-continuations

Browse Source 
Automatic merge from submit-queue

Fix make to include line-continuations

This got broken in recent changes.  Sorry for the noise.
This commit is contained in:
k8s-merge-robot 2016-07-15 13:00:09 -07:00 committed by GitHub
commit d7c17ca94c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.generated_files
View File

@ -245,7 +245,9 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk:
| grep "^$(PRJ_SRC_PATH)" \ | grep "^$(PRJ_SRC_PATH)" \
| sed 's|^$(PRJ_SRC_PATH)|./|' \ | sed 's|^$(PRJ_SRC_PATH)|./|' \
| xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \ | xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \
echo $$DIRECT $$INDIRECT | sed 's/ / =,/g' | tr '=,' '\n\t'; \ echo $$DIRECT $$INDIRECT \
| sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \
) | sed "s|$$(pwd -P)/||" > $@.tmp; \ ) | sed "s|$$(pwd -P)/||" > $@.tmp; \
cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp
@ -422,7 +424,9 @@ $(META_DIR)/$(CONVERSION_GEN).mk:
| grep "^$(PRJ_SRC_PATH)" \ | grep "^$(PRJ_SRC_PATH)" \
| sed 's|^$(PRJ_SRC_PATH)|./|' \ | sed 's|^$(PRJ_SRC_PATH)|./|' \
| xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \ | xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \
echo $$DIRECT $$INDIRECT | sed 's/ / =,/g' | tr '=,' '\n\t'; \ echo $$DIRECT $$INDIRECT \
| sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \
) | sed "s|$$(pwd -P)/||" > $@.tmp; \ ) | sed "s|$$(pwd -P)/||" > $@.tmp; \
cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp