| Message ID | 20210914121129.51451-4-joevt@shaw.ca |
|---|---|
| State | New |
| Headers | show |
| Series | [01/11] edid-decode: add more example EDIDs | expand |
On 14/09/2021 14:11, joevt wrote: > In macOS, /usr/bin and /usr/share/man belong to root:wheel so install to /usr/local/bin and /usr/local/share/man instead. > > Signed-off-by: Joe van Tunen <joevt@shaw.ca> > --- > Makefile | 22 +++++++++++++++++----- > 1 file changed, 17 insertions(+), 5 deletions(-) > > diff --git a/Makefile b/Makefile > index 287b72d..adf6123 100644 > --- a/Makefile > +++ b/Makefile > @@ -1,11 +1,23 @@ > -bindir ?= /usr/bin > -mandir ?= /usr/share/man > +ifeq ($(OS),Windows_NT) > + bindir ?= /usr/bin > + mandir ?= /usr/share/man > +else > + UNAME_S := $(shell uname -s) > + ifeq ($(UNAME_S),Darwin) > + bindir ?= /usr/local/sbin > + mandir ?= /usr/local/share/man > + else > + bindir ?= /usr/bin > + mandir ?= /usr/share/man > + endif > +endif > > EMXX ?= em++ > > -SOURCES = edid-decode.cpp parse-base-block.cpp parse-cta-block.cpp \ > - parse-displayid-block.cpp parse-ls-ext-block.cpp \ > - parse-di-ext-block.cpp parse-vtb-ext-block.cpp calc-gtf-cvt.cpp > +SOURCES = \ > + edid-decode.cpp parse-base-block.cpp parse-cta-block.cpp \ > + parse-displayid-block.cpp parse-ls-ext-block.cpp \ > + parse-di-ext-block.cpp parse-vtb-ext-block.cpp calc-gtf-cvt.cpp This last change is a spurious change, I'll drop this and keep the rest. No need for you to do anything. Regards, Hans > WARN_FLAGS = -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter > > all: edid-decode >
Thanks. That last change was made because I don't like to do aligning between lines that have different indents. That way you don't have to mix tabs and spaces or worry about different tab widths used by different people using different editors.
On 2021-09-15, 3:06 AM, "Hans Verkuil" <hverkuil@xs4all.nl> wrote:
On 14/09/2021 14:11, joevt wrote:
> In macOS, /usr/bin and /usr/share/man belong to root:wheel so install to /usr/local/bin and /usr/local/share/man instead.
>
> Signed-off-by: Joe van Tunen <joevt@shaw.ca>
> ---
> Makefile | 22 +++++++++++++++++-----
> 1 file changed, 17 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 287b72d..adf6123 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1,11 +1,23 @@
> -bindir ?= /usr/bin
> -mandir ?= /usr/share/man
> +ifeq ($(OS),Windows_NT)
> + bindir ?= /usr/bin
> + mandir ?= /usr/share/man
> +else
> + UNAME_S := $(shell uname -s)
> + ifeq ($(UNAME_S),Darwin)
> + bindir ?= /usr/local/sbin
> + mandir ?= /usr/local/share/man
> + else
> + bindir ?= /usr/bin
> + mandir ?= /usr/share/man
> + endif
> +endif
>
> EMXX ?= em++
>
> -SOURCES = edid-decode.cpp parse-base-block.cpp parse-cta-block.cpp \
> - parse-displayid-block.cpp parse-ls-ext-block.cpp \
> - parse-di-ext-block.cpp parse-vtb-ext-block.cpp calc-gtf-cvt.cpp
> +SOURCES = \
> + edid-decode.cpp parse-base-block.cpp parse-cta-block.cpp \
> + parse-displayid-block.cpp parse-ls-ext-block.cpp \
> + parse-di-ext-block.cpp parse-vtb-ext-block.cpp calc-gtf-cvt.cpp
This last change is a spurious change, I'll drop this and keep the rest.
No need for you to do anything.
Regards,
Hans
> WARN_FLAGS = -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter
>
> all: edid-decode
>
diff --git a/Makefile b/Makefile index 287b72d..adf6123 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,23 @@ -bindir ?= /usr/bin -mandir ?= /usr/share/man +ifeq ($(OS),Windows_NT) + bindir ?= /usr/bin + mandir ?= /usr/share/man +else + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Darwin) + bindir ?= /usr/local/sbin + mandir ?= /usr/local/share/man + else + bindir ?= /usr/bin + mandir ?= /usr/share/man + endif +endif EMXX ?= em++ -SOURCES = edid-decode.cpp parse-base-block.cpp parse-cta-block.cpp \ - parse-displayid-block.cpp parse-ls-ext-block.cpp \ - parse-di-ext-block.cpp parse-vtb-ext-block.cpp calc-gtf-cvt.cpp +SOURCES = \ + edid-decode.cpp parse-base-block.cpp parse-cta-block.cpp \ + parse-displayid-block.cpp parse-ls-ext-block.cpp \ + parse-di-ext-block.cpp parse-vtb-ext-block.cpp calc-gtf-cvt.cpp WARN_FLAGS = -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter all: edid-decode
In macOS, /usr/bin and /usr/share/man belong to root:wheel so install to /usr/local/bin and /usr/local/share/man instead. Signed-off-by: Joe van Tunen <joevt@shaw.ca> --- Makefile | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)