Skip to content

Commit

Permalink
Merge pull request kubernetes#29016 from thockin/fix-makefile-line-co…
Browse files Browse the repository at this point in the history
…ntinuations

Automatic merge from submit-queue

Fix make to include line-continuations

This got broken in recent changes.  Sorry for the noise.
  • Loading branch information
k8s-merge-robot authored Jul 15, 2016
2 parents b6c8790 + 31badf0 commit d7c17ca
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Makefile.generated_files
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,9 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk:
| grep "^$(PRJ_SRC_PATH)" \
| sed 's|^$(PRJ_SRC_PATH)|./|' \
| 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)/||" > [email protected]; \
cmp -s [email protected] $@ || cat [email protected] > $@ && rm -f [email protected]

Expand Down Expand Up @@ -422,7 +424,9 @@ $(META_DIR)/$(CONVERSION_GEN).mk:
| grep "^$(PRJ_SRC_PATH)" \
| sed 's|^$(PRJ_SRC_PATH)|./|' \
| 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)/||" > [email protected]; \
cmp -s [email protected] $@ || cat [email protected] > $@ && rm -f [email protected]

Expand Down

0 comments on commit d7c17ca

Please sign in to comment.