[evolution-ews/gnome-3-8] build: Fix srcdir != builddir from git
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews/gnome-3-8] build: Fix srcdir != builddir from git
- Date: Fri, 19 Apr 2013 09:10:48 +0000 (UTC)
commit 51e24c50c7b9efa7d7e928d2e9d7ff927d5491ba
Author: Colin Walters <walters verbum org>
Date: Fri Apr 19 11:10:23 2013 +0200
build: Fix srcdir != builddir from git
We can't do (cd $(srcdir); ...) and inside reference $(top_srcdir)
because that variable uses a *relative* path. Thus we copy the
approach from gnome-shell of explicitly using addprefix to append the
source directory.
src/server/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 5431b8d..b669d1c 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -7,15 +7,15 @@ privlib_LTLIBRARIES = libeews-1.2.la
ENUM_TYPES = e-ews-enums.h
e-ews-enumtypes.h: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES)
- $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.h.template \
+ $(AM_V_GEN) $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.h.template \
--fhead "#ifndef E_EWS_ENUMTYPES_H\n#define E_EWS_ENUMTYPES_H\n" \
--ftail "#endif /* E_EWS_ENUMTYPES_H */\n" \
- $(ENUM_TYPES)) > $@
+ $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
e-ews-enumtypes.c: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES)
- $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.c.template \
+ $(AM_V_GEN) $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.c.template \
--fhead "#include \"e-ews-enumtypes.h\"" \
- $(ENUM_TYPES)) > $@
+ $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
ENUM_GENERATED = \
e-ews-enumtypes.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]