| Message ID | 20221031212140.170601-1-peter@berginkonsult.se (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | da2e9798df4e0f2acf0bd5c67a4eddfda4b1e129 |
| Headers | show |
| Series | libtraceevent: make it possible to set libdir and mandir from outside | expand |
On 2022-10-31 22:21, Peter Bergin wrote: > When building in build frameworks such as openembedded it is desired > to use the defintion of libdir and mandir from the build framework. > > Signed-off-by: Peter Bergin <peter@berginkonsult.se> > --- > Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index fab8f7e..e974117 100644 > --- a/Makefile > +++ b/Makefile > @@ -46,8 +46,8 @@ endif > > libdir_relative ?= $(libdir_relative_temp) > prefix ?= /usr/local > -libdir = $(prefix)/$(libdir_relative) > -man_dir = $(prefix)/share/man > +libdir ?= $(prefix)/$(libdir_relative) > +man_dir ?= $(prefix)/share/man > man_dir_SQ = '$(subst ','\'',$(man_dir))' > pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) \ > --variable pc_path pkg-config | tr ":" " ")) This patch has been superseded by a v2 patch because I did a mistake and wrote the wrong prefix. Reference to new patch: https://lore.kernel.org/linux-trace-devel/20221101111143.191772-1-peter@berginkonsult.se/ Best regards, /Peter
On Tue, 1 Nov 2022 12:15:21 +0100 Peter Bergin <peter@berginkonsult.se> wrote: > On 2022-10-31 22:21, Peter Bergin wrote: > > When building in build frameworks such as openembedded it is desired > > to use the defintion of libdir and mandir from the build framework. > > > > Signed-off-by: Peter Bergin <peter@berginkonsult.se> > > --- > > Makefile | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/Makefile b/Makefile > > index fab8f7e..e974117 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -46,8 +46,8 @@ endif > > > > libdir_relative ?= $(libdir_relative_temp) > > prefix ?= /usr/local > > -libdir = $(prefix)/$(libdir_relative) > > -man_dir = $(prefix)/share/man > > +libdir ?= $(prefix)/$(libdir_relative) > > +man_dir ?= $(prefix)/share/man > > man_dir_SQ = '$(subst ','\'',$(man_dir))' > > pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) \ > > --variable pc_path pkg-config | tr ":" " ")) > > This patch has been superseded by a v2 patch because I did a mistake and > wrote the wrong prefix. Reference to new patch: > https://lore.kernel.org/linux-trace-devel/20221101111143.191772-1-peter@berginkonsult.se/ This one applies to libtraceevent, I think you meant to reply to: https://lore.kernel.org/all/20221031212110.170564-1-peter@berginkonsult.se/ -- Steve
On Wed, 9 Nov 2022 19:43:10 -0500 Steven Rostedt <rostedt@goodmis.org> wrote: > > This patch has been superseded by a v2 patch because I did a mistake and > > wrote the wrong prefix. Reference to new patch: > > https://lore.kernel.org/linux-trace-devel/20221101111143.191772-1-peter@berginkonsult.se/ > > This one applies to libtraceevent, I think you meant to reply to: > > https://lore.kernel.org/all/20221031212110.170564-1-peter@berginkonsult.se/ Anyway, I applied this to libtraceevent. Thanks! -- Steve
diff --git a/Makefile b/Makefile index fab8f7e..e974117 100644 --- a/Makefile +++ b/Makefile @@ -46,8 +46,8 @@ endif libdir_relative ?= $(libdir_relative_temp) prefix ?= /usr/local -libdir = $(prefix)/$(libdir_relative) -man_dir = $(prefix)/share/man +libdir ?= $(prefix)/$(libdir_relative) +man_dir ?= $(prefix)/share/man man_dir_SQ = '$(subst ','\'',$(man_dir))' pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) \ --variable pc_path pkg-config | tr ":" " "))
When building in build frameworks such as openembedded it is desired to use the defintion of libdir and mandir from the build framework. Signed-off-by: Peter Bergin <peter@berginkonsult.se> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)