| Message ID | 20230920133418.1893675-1-sam@gentoo.org |
|---|---|
| State | Accepted |
| Delegated to: | Jozsef Kadlecsik |
| Headers | show |
| Series | build: Fix double-prefix w/ pkgconfig | expand |
On Wed, Sep 20, 2023 at 02:34:17PM +0100, Sam James wrote: > First, apologies - 326932be0c4f47756f9809cad5a103ac310f700d clearly introduced > a double prefix and I can't tell you what my thought process was 9 months ago > but it was obviously wrong (my guess is I rebased some old patch and didn't > think properly, no idea). Not much use having this in the commit message. Maybe state the actual problem you're trying to solve instead? > Anyway, let's just drop the extraneous pkgconfigdir definition and use the > proper one from pkg.m4 via PKG_INSTALLDIR. > > Fixes: 326932be0c4f47756f9809cad5a103ac310f700d > Signed-off-by: Sam James <sam@gentoo.org> > --- > configure.ac | 1 + > lib/Makefile.am | 1 - > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > index cad93af..6c26645 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -14,6 +14,7 @@ LT_CONFIG_LTDL_DIR([libltdl]) > LTDL_INIT([nonrecursive]) > > PKG_PROG_PKG_CONFIG > +PKG_INSTALLDIR > > dnl Shortcut: Linux supported alone > case "$host" in > diff --git a/lib/Makefile.am b/lib/Makefile.am > index 50d937d..a9edf95 100644 > --- a/lib/Makefile.am > +++ b/lib/Makefile.am > @@ -46,7 +46,6 @@ EXTRA_libipset_la_SOURCES = \ > > EXTRA_DIST = $(IPSET_SETTYPE_LIST) libipset.map > > -pkgconfigdir = $(prefix)/$(libdir)/pkgconfig > pkgconfig_DATA = libipset.pc > > dist_man_MANS = libipset.3 > -- > 2.42.0 > >
diff --git a/configure.ac b/configure.ac index cad93af..6c26645 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,7 @@ LT_CONFIG_LTDL_DIR([libltdl]) LTDL_INIT([nonrecursive]) PKG_PROG_PKG_CONFIG +PKG_INSTALLDIR dnl Shortcut: Linux supported alone case "$host" in diff --git a/lib/Makefile.am b/lib/Makefile.am index 50d937d..a9edf95 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -46,7 +46,6 @@ EXTRA_libipset_la_SOURCES = \ EXTRA_DIST = $(IPSET_SETTYPE_LIST) libipset.map -pkgconfigdir = $(prefix)/$(libdir)/pkgconfig pkgconfig_DATA = libipset.pc dist_man_MANS = libipset.3
First, apologies - 326932be0c4f47756f9809cad5a103ac310f700d clearly introduced a double prefix and I can't tell you what my thought process was 9 months ago but it was obviously wrong (my guess is I rebased some old patch and didn't think properly, no idea). Anyway, let's just drop the extraneous pkgconfigdir definition and use the proper one from pkg.m4 via PKG_INSTALLDIR. Fixes: 326932be0c4f47756f9809cad5a103ac310f700d Signed-off-by: Sam James <sam@gentoo.org> --- configure.ac | 1 + lib/Makefile.am | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)