summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2010-09-26 13:32:14 +0200
committerBruno Haible <bruno@clisp.org>2010-09-26 13:32:14 +0200
commit3ac2ffacd418a8d20991cf8ee005cade9e67b842 (patch)
tree8f0aa42f9f98e32515ca03d331b9d47077cf4828
parent8a47ccba603bd290807ade6811c48d23814da734 (diff)
downloadlibunistring-3ac2ffacd418a8d20991cf8ee005cade9e67b842.tar.gz
Fix exported symbol list in VPATH builds after 2010-05-16 change.
-rw-r--r--ChangeLog6
-rw-r--r--lib/Makefile.am8
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d9f84d..89ae238 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-26 Bruno Haible <bruno@clisp.org>
+
+ Fix exported symbol list in VPATH builds after 2010-05-16 change.
+ * lib/Makefile.am (libunistring.sym): Find header files in the right
+ directory.
+
2010-09-23 Bruno Haible <bruno@clisp.org>
Update after gnulib changed.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d5c0d6f..65cf906 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -215,7 +215,13 @@ HEADERS_WITH_EXTERNS = \
# '-export-symbols', but we don't use this option, because it would prevent us
# from building some of the gnulib unit tests.
libunistring.sym : $(HEADERS_WITH_EXTERNS)
- for f in $(HEADERS_WITH_EXTERNS); do cat $(srcdir)/$$f; done \
+ for f in $(HEADERS_WITH_EXTERNS); do \
+ if test -f $$f; then \
+ cat $$f; \
+ else \
+ cat $(srcdir)/$$f; \
+ fi; \
+ done \
| $(srcdir)/declared.sh | LC_ALL=C sort | LC_ALL=C uniq \
| grep -v '^_UC' \
> $@-t