diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-04-29 03:44:29 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-04-29 03:44:29 +0200 |
| commit | cccd2787a7a3049e290db81121671f2d463a3bca (patch) | |
| tree | 03d5eeaf4c2aa4c0fec6795f3d5c86f19840efa6 | |
| parent | 0d3435fe1c247ece368b27ee7d1f44045a8f5177 (diff) | |
| download | libunistring-cccd2787a7a3049e290db81121671f2d463a3bca.tar.gz | |
Make VPATH builds work off a git checkout.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/Makefile.am | 9 |
2 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2009-04-28 Bruno Haible <bruno@clisp.org> + + Make VPATH builds work off a git checkout. + * lib/Makefile.am (config.h): Look for libunistring.sym first in the + current directory. + Reported by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>. + 2009-04-28 Thien-Thi Nguyen <ttn@gnuvola.org> (tiny change) Fix typos. diff --git a/lib/Makefile.am b/lib/Makefile.am index 4b709c6..199be73 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -219,7 +219,14 @@ config.h: $(BUILT_SOURCES) libunistring.sym done; \ } 5>&1 \ | sed -e 's,.* ,,' | LC_ALL=C sort | LC_ALL=C uniq \ - | LC_ALL=C join -v 1 - $(srcdir)/libunistring.sym \ + | { \ + if test -f libunistring.sym; then \ + symfile='libunistring.sym'; \ + else \ + symfile='$(srcdir)/libunistring.sym'; \ + fi; \ + LC_ALL=C join -v 1 - $$symfile; \ + } \ | sed -e 's,^\(.*\)$$,#define \1 libunistring_\1,' > config.h-t && \ if test -f config.h; then \ cat config.h-t >> config.h; \ |