From de653f40def2824a5ef253c07101c71732fb4ada Mon Sep 17 00:00:00 2001 From: George Caragea Date: Mon, 7 Mar 2016 14:19:59 -0800 Subject: [PATCH] Fixed GNUmakefile target in devel build Closes #488. --- gpAux/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gpAux/Makefile b/gpAux/Makefile index 98a0642c43..599d596dc1 100644 --- a/gpAux/Makefile +++ b/gpAux/Makefile @@ -115,7 +115,7 @@ LOADERSDEVPATH=$(GPROOT_DEV)$(LOADERSDIR) endif # files generated by 'configure' -ISCONFIG=../GNUmakefile +ISCONFIG=$(GPPGDIR)/GNUmakefile ## @@ -268,7 +268,7 @@ aix5_ppc_64_CONFIG_SHELL=/usr/bin/bash aix5_ppc_32_CONFIG_SHELL=/usr/bin/bash BLD_CONFIG_SHELL=$($(BLD_ARCH)_CONFIG_SHELL) -../GNUmakefile : $(GPPGDIR)/configure env.sh +$(GPPGDIR)/GNUmakefile : $(GPPGDIR)/configure env.sh rm -rf $(INSTLOC) mkdir -p $(GPPGDIR) $(MAKE) -C $(GPPGDIR)/src/bin/gpfdist/ext BLD_TOP=$(BLD_TOP) @@ -513,8 +513,7 @@ devel : BUILDDIR=Debug devel : ISCONFIG=$(BUILDDIR)/GNUmakefile devel : gccVersionCheck HOMEDEP Debug/GNUmakefile else -devel : ISCONFIG=../GNUmakefile -devel : gccVersionCheck HOMEDEP $(GPPGDIR)/GNUmakefile +devel : gccVersionCheck HOMEDEP $(ISCONFIG) endif $(BUILD_STEPS) @@ -534,7 +533,6 @@ dist : BUILDDIR=Release dist : ISCONFIG=$(BUILDDIR)/GNUmakefile dist : gccVersionCheck GPROOTDEP RECONFIG Release/GNUmakefile else -dist : ISCONFIG=../GNUmakefile dist : gccVersionCheck GPROOTDEP RECONFIG $(ISCONFIG) endif $(BUILD_STEPS) -- GitLab