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@gmail.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index c7033172502b65ff194fb6bb85effea8e0fd320f..8516459927404aff0071fe5a73e6240dc06ae3c6 100644 (file)
--- 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 9967ae0e9b316caf720e3edf5784780d92610e13..0fdc8f3150c8c7823b396ed85264535136f990fb 100644 (file)
--- 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