diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2021-11-12 11:18:13 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2021-11-12 11:18:13 +0900 |
| commit | 1e5b17f4284ea2904c65d08097735a1a4a8879a1 (patch) | |
| tree | b41bac3b7e5e78bd2af7b95388bd68d9da555ee1 | |
| parent | 61843dace32f12475b1ade5423deaa0421cbbc0b (diff) | |
| download | libgpg-error-1e5b17f4284ea2904c65d08097735a1a4a8879a1.tar.gz | |
configure: Escape includedir/libdir to defer interpretation of vars.
configure.ac: Escape includedir for GPG_ERROR_CONFIG_CFLAGS.
Escape libdir for GPG_ERROR_CONFIG_LIBS.
--
This can offer nice-looking gpg-error.pc.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 8c576b6..f13b14c 100644 --- a/configure.ac +++ b/configure.ac @@ -547,17 +547,17 @@ case "$includedir" in '${prefix}/include') if test "$prefix" != / -a "$prefix" != /usr; then if test -z "$GPG_ERROR_CONFIG_CFLAGS"; then - GPG_ERROR_CONFIG_CFLAGS="-I$includedir" + GPG_ERROR_CONFIG_CFLAGS="-I\${includedir}" else - GPG_ERROR_CONFIG_CFLAGS="-I$includedir $GPG_ERROR_CONFIG_CFLAGS" + GPG_ERROR_CONFIG_CFLAGS="-I\${includedir} $GPG_ERROR_CONFIG_CFLAGS" fi fi ;; *) if test -z "$GPG_ERROR_CONFIG_CFLAGS"; then - GPG_ERROR_CONFIG_CFLAGS="-I$includedir" + GPG_ERROR_CONFIG_CFLAGS="-I\${includedir}" else - GPG_ERROR_CONFIG_CFLAGS="-I$includedir $GPG_ERROR_CONFIG_CFLAGS" + GPG_ERROR_CONFIG_CFLAGS="-I\${includedir} $GPG_ERROR_CONFIG_CFLAGS" fi ;; esac @@ -566,13 +566,13 @@ case "$libdir" in '${exec_prefix}/lib') if test "$exec_prefix" = "NONE"; then if test "$prefix" != / -a "$prefix" != /usr; then - GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" + GPG_ERROR_CONFIG_LIBS="-L\${libdir} $GPG_ERROR_CONFIG_LIBS" fi elif test "$exec_prefix" != / -a "$exec_prefix" != /usr; then - GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" + GPG_ERROR_CONFIG_LIBS="-L\${libdir} $GPG_ERROR_CONFIG_LIBS" fi ;; - *) GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ;; + *) GPG_ERROR_CONFIG_LIBS="-L\${libdir} $GPG_ERROR_CONFIG_LIBS" ;; esac AC_SUBST(GPG_ERROR_CONFIG_LIBS) |