diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2009-08-17 00:07:35 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-08-17 00:07:35 -0400 |
| commit | 19db6454c48b6d8e4a0f033cf6c1d2b4be66f6c7 (patch) | |
| tree | 318b20be20c04da4fc15d7a910715448f612839c | |
| parent | b2d26635b316549c4e95f777961b68ea59372f91 (diff) | |
| download | gobject-introspection-19db6454c48b6d8e4a0f033cf6c1d2b4be66f6c7.tar.gz | |
autoconf-2.64 compat: Don't use $(builddir)
$(builddir) is not a standard automake variable. With autoconf < 2.64
it ends up getting set in every Makefile.in to '.' (because autoconf
defines it), but that is no longer the case for 2.64.
Since $(builddir) was always '.', just use that instead.
| -rw-r--r-- | gir/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/offsets/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am index caffabda..d47b180a 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -206,7 +206,7 @@ girdir = $(GIR_DIR) dist_gir_DATA = $(GIRSOURCES) %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) - LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ + LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ typelibsdir = $(libdir)/girepository-1.0 typelibs_DATA = $(GIRSOURCES:.gir=.typelib) diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am index 75dba3cb..b292ef6e 100644 --- a/tests/offsets/Makefile.am +++ b/tests/offsets/Makefile.am @@ -52,8 +52,8 @@ CLEANFILES += gitestoffsets.c ############################################################ check-local: offsets-1.0.typelib - LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(builddir) GI_TYPELIB_PATH=$(builddir):$(top_builddir)/gir \ - $(builddir)/gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected + LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:} GI_TYPELIB_PATH=:$(top_builddir)/gir \ + gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected diff -u offsets.compiled offsets.introspected CLEANFILES += offsets.compiled offsets.introspected |