Skip to content

Commit

Permalink
Fix make on Mac replacing sed with tr
Browse files Browse the repository at this point in the history
  • Loading branch information
aledbf committed Jul 15, 2016
1 parent 7823c57 commit d3d5693
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile.generated_files
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ DEEPCOPY_FILES := $(addsuffix /$(DEEPCOPY_FILENAME), $(DEEPCOPY_DIRS))
gen_deepcopy: $(DEEPCOPY_FILES)
if [[ -f $(META_DIR)/$(DEEPCOPY_GEN).todo ]]; then \
$(DEEPCOPY_GEN) \
-i $$(cat $(META_DIR)/$(DEEPCOPY_GEN).todo | paste -sd,) \
-i $$(cat $(META_DIR)/$(DEEPCOPY_GEN).todo | paste -sd, -) \
--bounding-dirs $(PRJ_SRC_PATH) \
-O $(DEEPCOPY_BASENAME); \
fi
Expand Down Expand Up @@ -244,7 +244,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk:
./cmd/libs/go2idl/deepcopy-gen \
| grep "^$(PRJ_SRC_PATH)" \
| xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \
echo $$DIRECT $$INDIRECT | sed 's/ / \\\n\t/g'; \
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 @@ -310,7 +310,7 @@ CONVERSION_FILES := $(addsuffix /$(CONVERSION_FILENAME), $(CONVERSION_DIRS))
gen_conversion: $(CONVERSION_FILES)
if [[ -f $(META_DIR)/$(CONVERSION_GEN).todo ]]; then \
$(CONVERSION_GEN) \
-i $$(cat $(META_DIR)/$(CONVERSION_GEN).todo | paste -sd,) \
-i $$(cat $(META_DIR)/$(CONVERSION_GEN).todo | paste -sd, -) \
-O $(CONVERSION_BASENAME); \
fi

Expand Down Expand Up @@ -420,7 +420,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk:
./cmd/libs/go2idl/conversion-gen \
| grep "^$(PRJ_SRC_PATH)" \
| xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \
echo $$DIRECT $$INDIRECT | sed 's/ / \\\n\t/g'; \
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 d3d5693

Please sign in to comment.