tachi
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autotools: replace PKGCONFIGDIR with PKG_DEFAULT_PATH

feature/tap-sh
William Pitcock 2017-06-24 12:45:44 -05:00
parent 3ae11b1b4d
commit 38cda5e584
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -4,7 +4,7 @@ datadir = @datadir@
includedir = @includedir@ includedir = @includedir@
system_includedir = @SYSTEM_INCLUDEDIR@ system_includedir = @SYSTEM_INCLUDEDIR@
system_libdir = @SYSTEM_LIBDIR@ system_libdir = @SYSTEM_LIBDIR@
pkg_default_dir = @PKGCONFIGDIR@ pkg_default_dir = @PKG_DEFAULT_PATH@
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
nodist_pkgconfig_DATA = libpkgconf.pc nodist_pkgconfig_DATA = libpkgconf.pc

6
configure.ac
View File

@ -24,10 +24,10 @@ LT_INIT
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
AC_ARG_WITH([pkg-config-dir],[AC_HELP_STRING([--with-pkg-config-dir],[specify AC_ARG_WITH([pkg-config-dir],[AC_HELP_STRING([--with-pkg-config-dir],[specify
the place where pc files will be found])],PKGCONFIGDIR="$withval", the place where pc files will be found])],PKG_DEFAULT_PATH="$withval",
PKGCONFIGDIR="${libdir}/pkgconfig:${datadir}/pkgconfig") PKG_DEFAULT_PATH="${libdir}/pkgconfig:${datadir}/pkgconfig")
AC_SUBST([PKGCONFIGDIR]) AC_SUBST([PKG_DEFAULT_PATH])
AC_ARG_WITH([system-libdir],[AC_HELP_STRING([--with-system-libdir],[specify the AC_ARG_WITH([system-libdir],[AC_HELP_STRING([--with-system-libdir],[specify the
system library directory (default LIBDIR)])], system library directory (default LIBDIR)])],

2
tests/test_env.sh.in
View File

@ -31,7 +31,7 @@ esac
prefix="@prefix@" prefix="@prefix@"
exec_prefix="@exec_prefix@" exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
pcpath="@PKGCONFIGDIR@" pcpath="@PKG_DEFAULT_PATH@"
tests_init() tests_init()
{ {