Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

let the makefile choose the correct sed #279

Merged
merged 1 commit into from
Jul 9, 2016
Merged

let the makefile choose the correct sed #279

merged 1 commit into from
Jul 9, 2016

Conversation

murinicanor
Copy link
Contributor

there is no gsed on some systems (i.e. on debian, where i'm building the documentation), so let the makefile choose the correct sed variant

@coveralls
Copy link

coveralls commented Jul 9, 2016

Coverage Status

Coverage remained the same at 100.0% when pulling 01f9ee5 on murinicanor:patch-1 into 98d48ef on nlohmann:develop.

@codecov-io
Copy link

Current coverage is 100%

Merging #279 into develop will not change coverage

@@           develop   #279   diff @@
=====================================
  Files            1      1          
  Lines         2097   2054    -43   
  Methods        296    296          
  Messages         0      0          
  Branches       294    294          
=====================================
- Hits          2097   2054    -43   
  Misses           0      0          
  Partials         0      0          

Powered by Codecov. Last updated by 98d48ef...01f9ee5

@nlohmann nlohmann added this to the Release 2.0.2 milestone Jul 9, 2016
@nlohmann nlohmann merged commit 8116413 into nlohmann:develop Jul 9, 2016
@nlohmann
Copy link
Owner

nlohmann commented Jul 9, 2016

Thanks!

@nlohmann
Copy link
Owner

@murinicanor I realized that on OSX, sed and gsed are available, but only gsed can be used. So the code should be

SED:=$(shell command -v gsed || sed)

@murinicanor
Copy link
Contributor Author

hi,

i've added a commit to the branch that changes the order of gsed and sed and also uses which to have the full path of sed: 0eb9f0c
(sorry, don't know if there's a way to update the pull request after its been merged)

nlohmann added a commit that referenced this pull request Jul 18, 2016
@nlohmann
Copy link
Owner

No worries - I made the change myself.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants