diff options
author | Tollef Fog Heen <tfheen@err.no> | 2006-08-16 20:47:14 +0200 |
---|---|---|
committer | Tollef Fog Heen <tfheen@err.no> | 2006-08-16 20:47:14 +0200 |
commit | 6d32cb3e6d6eabf29a32bdbdc104898f08c5965e (patch) | |
tree | 0a071d34ba394d8b4ffc3f7db5427cb9db8c54ad | |
parent | 0936824bf02c604457147af1858ae6f5b504155f (diff) | |
download | pkg-config-6d32cb3e6d6eabf29a32bdbdc104898f08c5965e.tar.gz |
2006-08-16 Tollef Fog Heen <tfheen@err.no>
* parse.c (trim_and_sub): Since %{...} has not been used for a
long time, there is no point in being able to escape %. However,
make the code able to escape $ by doubling the $ to $$.
Debian #378570
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,5 +1,10 @@ 2006-08-16 Tollef Fog Heen <tfheen@err.no> + * parse.c (trim_and_sub): Since %{...} has not been used for a + long time, there is no point in being able to escape %. However, + make the code able to escape $ by doubling the $ to $$. + Debian #378570 + * pkg.c (packages_get_other_cflags, package_get_other_cflags) (packages_get_I_cflags): Always add all cflags. Debian #340904 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001, 2002, 2005 Red Hat Inc. + * Copyright (C) 2001, 2002, 2005-2006 Red Hat Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -169,8 +169,8 @@ trim_and_sub (Package *pkg, const char *str, const char *path) if (p[0] == '$' && p[1] == '$') { - /* escaped % */ - g_string_append_c (subst, '%'); + /* escaped $ */ + g_string_append_c (subst, '$'); p += 2; } else if (p[0] == '$' && |