diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/gpg-error-config-head.in | 17 | ||||
| -rw-r--r-- | src/gpg-error-config-main.sh (renamed from src/gpg-error-config.in) | 18 | ||||
| -rw-r--r-- | src/gpg-error.pc.in | 1 | ||||
| -rw-r--r-- | src/pkgconf-funcs.sh | 4 |
5 files changed, 26 insertions, 22 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index fcfbb83..98e3b94 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -88,11 +88,17 @@ nodist_bin_SCRIPTS = gpgrt-config m4datadir = $(datadir)/aclocal m4data_DATA = gpg-error.m4 gpgrt.m4 +pkgconfigdir = $(datadir)/pkgconfig +pkgconfig_DATA = gpg-error.pc + EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkerrnos.awk errnos.in README \ mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ - err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 gpgrt.m4 \ + err-sources.h err-codes.h \ + gpg-error-config-head.in pkgconf-funcs.sh gpg-error-config-main.sh \ + gpg-error.pc.in \ + gpg-error.m4 gpgrt.m4 \ gpg-error.vers gpg-error.def.in \ versioninfo.rc.in gpg-error.w32-manifest.in \ $(lock_obj_pub) diff --git a/src/gpg-error-config-head.in b/src/gpg-error-config-head.in new file mode 100644 index 0000000..1c50fa0 --- /dev/null +++ b/src/gpg-error-config-head.in @@ -0,0 +1,17 @@ +#!/bin/sh +# Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This file is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# SPDX-License-Identifier: FSFULLR + +prefix=@prefix@ +datarootdir=@datarootdir@ +datadir=@datadir@ +PKG_CONFIG_PATH="${datadir}/pkgconfig" +# diff --git a/src/gpg-error-config.in b/src/gpg-error-config-main.sh index a0a0141..e2ff26d 100644 --- a/src/gpg-error-config.in +++ b/src/gpg-error-config-main.sh @@ -1,21 +1,3 @@ -#!/bin/sh -# Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This file is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# SPDX-License-Identifier: FSFULLR - -prefix=@prefix@ -datarootdir=@datarootdir@ -datadir=@datadir@ -PKG_CONFIG_PATH="${datadir}/pkgconfig" - -@PKGCONF_FUNCS_SH_CONTENT@ if echo "$0" | grep gpg-error-config 2>/dev/null >/dev/null; then myname="gpg-error-config" diff --git a/src/gpg-error.pc.in b/src/gpg-error.pc.in index fe8b553..3e8d328 100644 --- a/src/gpg-error.pc.in +++ b/src/gpg-error.pc.in @@ -2,7 +2,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ includedir=@includedir@ libdir=@libdir@ -isubdirafter=@GPG_ERROR_CONFIG_ISUBDIRAFTER@ host=@GPG_ERROR_CONFIG_HOST@ mtcflags=@GPG_ERROR_CONFIG_MT_CFLAGS@ mtlibs=@GPG_ERROR_CONFIG_MT_LIBS@ diff --git a/src/pkgconf-funcs.sh b/src/pkgconf-funcs.sh index 381243c..d06b68b 100644 --- a/src/pkgconf-funcs.sh +++ b/src/pkgconf-funcs.sh @@ -1,4 +1,4 @@ -#################### start of pkgconf-funcs +#### start of pkgconf-funcs # # Bourne shell functions for config file in pkg-config style, so that @@ -116,4 +116,4 @@ find_file_in_path () { RESULT="" return 1 } -#################### end of pkgconf-funcs +#### end of pkgconf-funcs |