From 7dec65de1a2f3c879a53a7a1649b0d8899412a39 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Apr 2013 11:30:24 -0400 Subject: build: Fix srcdir != builddir from git Mimicing Colin's commit fb9b02e for E-D-S. 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. --- shell/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'shell') diff --git a/shell/Makefile.am b/shell/Makefile.am index d36547e609..92bfe49bcc 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -9,15 +9,15 @@ eshellincludedir = $(privincludedir)/shell ENUM_TYPES = e-shell.h e-shell-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_SHELL_ENUMTYPES_H\n#define E_SHELL_ENUMTYPES_H\n" \ --ftail "#endif /* E_SHELL_ENUMTYPES_H */\n" \ - $(ENUM_TYPES)) > $@ + $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@ e-shell-enumtypes.c: $(top_srcdir)/enumtypes.c.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-shell-enumtypes.h\"" \ - $(ENUM_TYPES)) > $@ + $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@ ENUM_GENERATED = e-shell-enumtypes.h e-shell-enumtypes.c -- cgit v1.2.3