diff options
| author | Werner Koch <wk@gnupg.org> | 2015-01-05 15:41:01 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-01-05 15:43:37 +0100 |
| commit | abe43b5cbf066086deb735bba37178b34f12a4cb (patch) | |
| tree | 5c04ecc896a07c6de2c5f10f2711f54a6ba3b0ec /build-aux | |
| parent | 3d32de205211ca91d21941273db306a759ccc3ba (diff) | |
| download | libgpg-error-abe43b5cbf066086deb735bba37178b34f12a4cb.tar.gz | |
build: Update to gettext 0.19.
* po/Makefile.in.in (MSGMERGE): Remove --previous.
* po/Makevars (MSGMERGE_OPTIONS): Add --previous.
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/config.rpath | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/build-aux/config.rpath b/build-aux/config.rpath index c38b914..b625621 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2013 Free Software Foundation, Inc. +# Copyright 1996-2014 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -367,11 +367,7 @@ else dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) + freebsd2.[01]*) hardcode_direct=yes hardcode_minus_L=yes ;; @@ -548,13 +544,11 @@ case "$host_os" in dgux*) library_names_spec='$libname$shrext' ;; + freebsd[23].*) + library_names_spec='$libname$shrext$versuffix' + ;; freebsd* | dragonfly*) - case "$host_os" in - freebsd[123]*) - library_names_spec='$libname$shrext$versuffix' ;; - *) - library_names_spec='$libname$shrext' ;; - esac + library_names_spec='$libname$shrext' ;; gnu*) library_names_spec='$libname$shrext' |