Permalink
Browse files

Fix build issue when srcdir != builddir

  • Loading branch information...
1 parent 7e72434 commit f23cacb49328af91eccd29bed5211997edf05257 @tagoh committed Nov 29, 2012
Showing with 4 additions and 1 deletion.
  1. +1 −1 data/Makefile.am
  2. +1 −0 extensions/Makefile.am
  3. +2 −0 liblangtag-gobject/Makefile.am
View
@@ -65,7 +65,7 @@ language-subtag-registry.xml: language-subtag-registry reg2xml.c Makefile
else
if REBUILD_DATA
language-subtag-registry.xml: language-subtag-registry reg2xml$(EXEEXT) Makefile
- $(AM_V_GEN) $(builddir)/reg2xml$(EXEEXT) $(srcdir)/language-subtag-registry $@.tmp; \
+ $(AM_V_GEN) $(builddir)/reg2xml$(EXEEXT) $(srcdir)/language-subtag-registry $@.tmp || $(builddir)/reg2xml$(EXEEXT) $(builddir)/language-subtag-registry $@.tmp; \
head -1 $@.tmp | grep -E '^<\?xml version'>/dev/null 2>&1 && mv $@.tmp $@ || (echo "E: $@ isn't an expected result"; rm $@.tmp)
else
language-subtag-registry.xml:
View
@@ -3,6 +3,7 @@
NULL =
INCLUDES = \
-I$(top_srcdir)/liblangtag/ \
+ -I$(top_builddir)/liblangtag/ \
-I$(top_srcdir) \
-D__LANGTAG_COMPILATION \
-DBUILDDIR="\"$(abs_top_builddir)\"" \
@@ -4,6 +4,8 @@
# Global definitions
NULL =
INCLUDES = \
+ -I$(top_builddir)/liblangtag-gobject/ \
+ -I$(top_builddir) \
-I$(top_srcdir)/liblangtag/ \
-I$(top_srcdir) \
-D__LANGTAG_COMPILATION \

0 comments on commit f23cacb

Please sign in to comment.