| Message ID | 20180124092736.8432-2-marcus.folkesson@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Wed, Jan 24, 2018 at 10:27 AM, Marcus Folkesson <marcus.folkesson@gmail.com> wrote: > This patch solves the following issues: > - The pkg-config files generates odd paths when using DESTDIR without PREFIX > - DESTDIR is needed during compile time to compute library and header paths which it should not. > - Installing with both DESTDIR and PREFIX set gives us odd paths > - Make usage of DESTDIR and PREFIX more standard > > Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> > --- > README | 2 +- > libsepol/include/Makefile | 4 ++-- > libsepol/man/Makefile | 5 +++-- > libsepol/src/Makefile | 7 +++---- > libsepol/src/libsepol.pc.in | 2 +- > libsepol/utils/Makefile | 4 ++-- > 6 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/README b/README > index 7fc7b17b..174551a1 100644 > --- a/README > +++ b/README > @@ -19,6 +19,6 @@ lacks library functions or other dependencies relied upon by your > distribution. If it breaks, you get to keep both pieces. > > To install libsepol on macOS (mainly for policy analysis): > -cd libsepol; make DESTDIR=/usr/local PREFIX=/usr/local install > +cd libsepol; make PREFIX=/usr/local install > > This requires GNU coreutils (brew install coreutils). > diff --git a/libsepol/include/Makefile b/libsepol/include/Makefile > index 56b7a114..ad5c34a4 100644 > --- a/libsepol/include/Makefile > +++ b/libsepol/include/Makefile > @@ -1,6 +1,6 @@ > # Installation directories. > -PREFIX ?= $(DESTDIR)/usr > -INCDIR ?= $(PREFIX)/include/sepol > +PREFIX ?= /usr > +INCDIR = $(DESTDIR)$(PREFIX)/include/sepol > CILDIR ?= ../cil > > all: > diff --git a/libsepol/man/Makefile b/libsepol/man/Makefile > index 11924334..4f3d9fa2 100644 > --- a/libsepol/man/Makefile > +++ b/libsepol/man/Makefile > @@ -1,6 +1,7 @@ > # Installation directories. > -MAN8DIR ?= $(DESTDIR)/usr/share/man/man8 > -MAN3DIR ?= $(DESTDIR)/usr/share/man/man3 > +PREFIX ?= /usr > +MAN8DIR ?= $(DESTDIR)$(PREFIX)/share/man/man8 > +MAN3DIR ?= $(DESTDIR)$(PREFIX)/share/man/man3 > > all: > > diff --git a/libsepol/src/Makefile b/libsepol/src/Makefile > index 819d261b..d158398f 100644 > --- a/libsepol/src/Makefile > +++ b/libsepol/src/Makefile > @@ -1,10 +1,9 @@ > # Installation directories. > -PREFIX ?= $(DESTDIR)/usr > +PREFIX ?= /usr > INCLUDEDIR ?= $(PREFIX)/include > -LIBDIR ?= $(PREFIX)/lib > +LIBDIR ?= $(DESTDIR)$(PREFIX)/lib > SHLIBDIR ?= $(DESTDIR)/lib > RANLIB ?= ranlib > -LIBBASE ?= $(shell basename $(LIBDIR)) > CILDIR ?= ../cil > > VERSION = $(shell cat ../VERSION) > @@ -52,7 +51,7 @@ $(LIBSO): $(LOBJS) $(LIBMAP) > ln -sf $@ $(TARGET) > > $(LIBPC): $(LIBPC).in ../VERSION > - sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ > + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ > > $(LIBMAP): $(LIBMAP).in > ifneq ($(DISABLE_CIL),y) > diff --git a/libsepol/src/libsepol.pc.in b/libsepol/src/libsepol.pc.in > index e52f5892..f807fec6 100644 > --- a/libsepol/src/libsepol.pc.in > +++ b/libsepol/src/libsepol.pc.in > @@ -1,6 +1,6 @@ > prefix=@prefix@ > exec_prefix=${prefix} > -libdir=${exec_prefix}/@libdir@ > +libdir=@libdir@ > includedir=@includedir@ > > Name: libsepol So this patch results in producing libsepol.pc with the value of $(DESTDIR) in libdir (because "s:@libdir@:$(LIBDIR):" in the sed command, and "LIBDIR ?= $(DESTDIR)$(PREFIX)/lib" in the Makefile). Is this intended? I supposed the point of these patches was to craft pkg-config files without references to $(DESTDIR), like the first version of this patch did. What did I miss? Best, Nicolas
On Wed, Jan 24, 2018 at 10:29:07PM +0100, Nicolas Iooss wrote: > On Wed, Jan 24, 2018 at 10:27 AM, Marcus Folkesson > <marcus.folkesson@gmail.com> wrote: > > This patch solves the following issues: > > - The pkg-config files generates odd paths when using DESTDIR without PREFIX > > - DESTDIR is needed during compile time to compute library and header paths which it should not. > > - Installing with both DESTDIR and PREFIX set gives us odd paths > > - Make usage of DESTDIR and PREFIX more standard > > > > Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> > > --- > > README | 2 +- > > libsepol/include/Makefile | 4 ++-- > > libsepol/man/Makefile | 5 +++-- > > libsepol/src/Makefile | 7 +++---- > > libsepol/src/libsepol.pc.in | 2 +- > > libsepol/utils/Makefile | 4 ++-- > > 6 files changed, 12 insertions(+), 12 deletions(-) > > > > diff --git a/README b/README > > index 7fc7b17b..174551a1 100644 > > --- a/README > > +++ b/README > > @@ -19,6 +19,6 @@ lacks library functions or other dependencies relied upon by your > > distribution. If it breaks, you get to keep both pieces. > > > > To install libsepol on macOS (mainly for policy analysis): > > -cd libsepol; make DESTDIR=/usr/local PREFIX=/usr/local install > > +cd libsepol; make PREFIX=/usr/local install > > > > This requires GNU coreutils (brew install coreutils). > > diff --git a/libsepol/include/Makefile b/libsepol/include/Makefile > > index 56b7a114..ad5c34a4 100644 > > --- a/libsepol/include/Makefile > > +++ b/libsepol/include/Makefile > > @@ -1,6 +1,6 @@ > > # Installation directories. > > -PREFIX ?= $(DESTDIR)/usr > > -INCDIR ?= $(PREFIX)/include/sepol > > +PREFIX ?= /usr > > +INCDIR = $(DESTDIR)$(PREFIX)/include/sepol > > CILDIR ?= ../cil > > > > all: > > diff --git a/libsepol/man/Makefile b/libsepol/man/Makefile > > index 11924334..4f3d9fa2 100644 > > --- a/libsepol/man/Makefile > > +++ b/libsepol/man/Makefile > > @@ -1,6 +1,7 @@ > > # Installation directories. > > -MAN8DIR ?= $(DESTDIR)/usr/share/man/man8 > > -MAN3DIR ?= $(DESTDIR)/usr/share/man/man3 > > +PREFIX ?= /usr > > +MAN8DIR ?= $(DESTDIR)$(PREFIX)/share/man/man8 > > +MAN3DIR ?= $(DESTDIR)$(PREFIX)/share/man/man3 > > > > all: > > > > diff --git a/libsepol/src/Makefile b/libsepol/src/Makefile > > index 819d261b..d158398f 100644 > > --- a/libsepol/src/Makefile > > +++ b/libsepol/src/Makefile > > @@ -1,10 +1,9 @@ > > # Installation directories. > > -PREFIX ?= $(DESTDIR)/usr > > +PREFIX ?= /usr > > INCLUDEDIR ?= $(PREFIX)/include > > -LIBDIR ?= $(PREFIX)/lib > > +LIBDIR ?= $(DESTDIR)$(PREFIX)/lib > > SHLIBDIR ?= $(DESTDIR)/lib > > RANLIB ?= ranlib > > -LIBBASE ?= $(shell basename $(LIBDIR)) > > CILDIR ?= ../cil > > > > VERSION = $(shell cat ../VERSION) > > @@ -52,7 +51,7 @@ $(LIBSO): $(LOBJS) $(LIBMAP) > > ln -sf $@ $(TARGET) > > > > $(LIBPC): $(LIBPC).in ../VERSION > > - sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ > > + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ > > > > $(LIBMAP): $(LIBMAP).in > > ifneq ($(DISABLE_CIL),y) > > diff --git a/libsepol/src/libsepol.pc.in b/libsepol/src/libsepol.pc.in > > index e52f5892..f807fec6 100644 > > --- a/libsepol/src/libsepol.pc.in > > +++ b/libsepol/src/libsepol.pc.in > > @@ -1,6 +1,6 @@ > > prefix=@prefix@ > > exec_prefix=${prefix} > > -libdir=${exec_prefix}/@libdir@ > > +libdir=@libdir@ > > includedir=@includedir@ > > > > Name: libsepol > > So this patch results in producing libsepol.pc with the value of > $(DESTDIR) in libdir (because "s:@libdir@:$(LIBDIR):" in the sed > command, and "LIBDIR ?= $(DESTDIR)$(PREFIX)/lib" in the Makefile). Is > this intended? I supposed the point of these patches was to craft > pkg-config files without references to $(DESTDIR), like the first > version of this patch did. What did I miss? > This is a regression between v2 and v3 I think. Maybe we should remove DESTDIR from all variables and only use it in the install target. e.g. SHLIBDIR ?= /lib ... install: install -m 755 $(LIBSO) $(DESTDIR)$(SHLIBDIR) > Best, > Nicolas >
diff --git a/README b/README index 7fc7b17b..174551a1 100644 --- a/README +++ b/README @@ -19,6 +19,6 @@ lacks library functions or other dependencies relied upon by your distribution. If it breaks, you get to keep both pieces. To install libsepol on macOS (mainly for policy analysis): -cd libsepol; make DESTDIR=/usr/local PREFIX=/usr/local install +cd libsepol; make PREFIX=/usr/local install This requires GNU coreutils (brew install coreutils). diff --git a/libsepol/include/Makefile b/libsepol/include/Makefile index 56b7a114..ad5c34a4 100644 --- a/libsepol/include/Makefile +++ b/libsepol/include/Makefile @@ -1,6 +1,6 @@ # Installation directories. -PREFIX ?= $(DESTDIR)/usr -INCDIR ?= $(PREFIX)/include/sepol +PREFIX ?= /usr +INCDIR = $(DESTDIR)$(PREFIX)/include/sepol CILDIR ?= ../cil all: diff --git a/libsepol/man/Makefile b/libsepol/man/Makefile index 11924334..4f3d9fa2 100644 --- a/libsepol/man/Makefile +++ b/libsepol/man/Makefile @@ -1,6 +1,7 @@ # Installation directories. -MAN8DIR ?= $(DESTDIR)/usr/share/man/man8 -MAN3DIR ?= $(DESTDIR)/usr/share/man/man3 +PREFIX ?= /usr +MAN8DIR ?= $(DESTDIR)$(PREFIX)/share/man/man8 +MAN3DIR ?= $(DESTDIR)$(PREFIX)/share/man/man3 all: diff --git a/libsepol/src/Makefile b/libsepol/src/Makefile index 819d261b..d158398f 100644 --- a/libsepol/src/Makefile +++ b/libsepol/src/Makefile @@ -1,10 +1,9 @@ # Installation directories. -PREFIX ?= $(DESTDIR)/usr +PREFIX ?= /usr INCLUDEDIR ?= $(PREFIX)/include -LIBDIR ?= $(PREFIX)/lib +LIBDIR ?= $(DESTDIR)$(PREFIX)/lib SHLIBDIR ?= $(DESTDIR)/lib RANLIB ?= ranlib -LIBBASE ?= $(shell basename $(LIBDIR)) CILDIR ?= ../cil VERSION = $(shell cat ../VERSION) @@ -52,7 +51,7 @@ $(LIBSO): $(LOBJS) $(LIBMAP) ln -sf $@ $(TARGET) $(LIBPC): $(LIBPC).in ../VERSION - sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ $(LIBMAP): $(LIBMAP).in ifneq ($(DISABLE_CIL),y) diff --git a/libsepol/src/libsepol.pc.in b/libsepol/src/libsepol.pc.in index e52f5892..f807fec6 100644 --- a/libsepol/src/libsepol.pc.in +++ b/libsepol/src/libsepol.pc.in @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=${prefix} -libdir=${exec_prefix}/@libdir@ +libdir=@libdir@ includedir=@includedir@ Name: libsepol diff --git a/libsepol/utils/Makefile b/libsepol/utils/Makefile index fba1d8a0..8ce4bf47 100644 --- a/libsepol/utils/Makefile +++ b/libsepol/utils/Makefile @@ -1,6 +1,6 @@ # Installation directories. -PREFIX ?= $(DESTDIR)/usr -BINDIR ?= $(PREFIX)/bin +PREFIX ?= /usr +BINDIR ?= $(DESTDIR)$(PREFIX)/bin CFLAGS ?= -Wall -Werror override CFLAGS += -I../include
This patch solves the following issues: - The pkg-config files generates odd paths when using DESTDIR without PREFIX - DESTDIR is needed during compile time to compute library and header paths which it should not. - Installing with both DESTDIR and PREFIX set gives us odd paths - Make usage of DESTDIR and PREFIX more standard Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> --- README | 2 +- libsepol/include/Makefile | 4 ++-- libsepol/man/Makefile | 5 +++-- libsepol/src/Makefile | 7 +++---- libsepol/src/libsepol.pc.in | 2 +- libsepol/utils/Makefile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-)