Mesa (master): automake: use only the folder name if it' s a subfolder of the present one

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 90a4ffdea5b8762954ce8805ad4e2ecd26f96630
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=90a4ffdea5b8762954ce8805ad4e2ecd26f96630

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Sat Mar  8 19:01:28 2014 +0000

automake: use only the folder name if it's a subfolder of the present one

v2: Resolve rebase conflicts.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>

---

 src/glsl/Makefile.am |    4 ++--
 src/mesa/Makefile.am |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index c703317..8516459 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -178,11 +178,11 @@ glsl_lexer.cpp: glsl_lexer.ll
 	$(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $<
 
 glcpp/glcpp-parse.c glcpp/glcpp-parse.h: glcpp/glcpp-parse.y
-	$(AM_V_at)$(MKDIR_P) $(GLSL_BUILDDIR)/glcpp
+	$(AM_V_at)$(MKDIR_P) glcpp
 	$(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "glcpp_parser_" --defines=$(GLSL_BUILDDIR)/glcpp/glcpp-parse.h $<
 
 glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
-	$(AM_V_at)$(MKDIR_P) $(GLSL_BUILDDIR)/glcpp
+	$(AM_V_at)$(MKDIR_P) glcpp
 	$(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $<
 
 # Only the parsers (specifically the header files generated at the same time)
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 9967ae0..0fdc8f3 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -150,11 +150,11 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gl.pc
 
 $(BUILDDIR)program/lex.yy.c: program/program_lexer.l
-	$(AM_V_at)$(MKDIR_P) $(builddir)/program
+	$(AM_V_at)$(MKDIR_P) program
 	$(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $<
 
 $(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h: program/program_parse.y
-	$(AM_V_at)$(MKDIR_P) $(builddir)/program
+	$(AM_V_at)$(MKDIR_P) program
 	$(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=$(BUILDDIR)program/program_parse.tab.c $<
 
 if GEN_ASM_OFFSETS