From f785aed1058d7baf19c9d77e35fdf80a7f759907 Mon Sep 17 00:00:00 2001
From: Daniel Gustafsson <dgustafsson@pivotal.io>
Date: Tue, 4 Apr 2017 10:20:56 +0200
Subject: [PATCH] Fix gpfdist Makefile rules

The extension for executable binaries is defined in X, replace the
old (and now defunct) references to EXE_EXT. Also remove a commented
out dead gpfdist rule in gpMgmt from before the move to core.
---
 gpMgmt/Makefile          | 1 -
 src/bin/gpfdist/Makefile | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gpMgmt/Makefile b/gpMgmt/Makefile
index 2a7423325b..4537f79e78 100644
--- a/gpMgmt/Makefile
+++ b/gpMgmt/Makefile
@@ -92,7 +92,6 @@ install: generate_greenplum_path_file
 
 	$(MAKE) -C sbin $@ prefix=$(DESTDIR)$(prefix)
 
-	#cp -p extensions/gpfdist/gpfdist$(EXE_EXT) $(DESTDIR)$(prefix)/bin/
 	cp $(top_builddir)/src/test/regress/*.pl $(DESTDIR)$(prefix)/bin
 	cp $(top_builddir)/src/test/regress/*.pm $(DESTDIR)$(prefix)/bin
 	if [ ! -d ${DESTDIR}${prefix}/docs ] ; then mkdir ${DESTDIR}${prefix}/docs ; fi
diff --git a/src/bin/gpfdist/Makefile b/src/bin/gpfdist/Makefile
index 1ab5536315..e95e056f56 100644
--- a/src/bin/gpfdist/Makefile
+++ b/src/bin/gpfdist/Makefile
@@ -31,7 +31,7 @@ endif
 
 LDLIBS += $(LIBS) $(GPFDIST_LIBS) $(apr_link_ld_libs)
 
-all: gpfdist$(EXE_EXT)
+all: gpfdist$(X)
 
 fstream.c: $(top_builddir)/src/backend/utils/misc/fstream/fstream.c
 	ln -s $< $@
@@ -39,18 +39,18 @@ fstream.c: $(top_builddir)/src/backend/utils/misc/fstream/fstream.c
 gfile.c: $(top_builddir)/src/backend/utils/misc/fstream/gfile.c
 	ln -s $< $@
 
-gpfdist$(EXE_EXT): $(OBJS)
+gpfdist$(X): $(OBJS)
 	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) $(LDLIBS) -o $@
 
 install: all
-	$(INSTALL) gpfdist$(EXE_EXT) $(DESTDIR)$(prefix)/bin
+	$(INSTALL) gpfdist$(X) $(DESTDIR)$(prefix)/bin
 
 installcheck:
 	$(MAKE) -C regress installcheck
 
 .PHONY: clean distclean
 clean:
-	rm -f $(OBJS) gpfdist$(EXE_EXT)
+	rm -f $(OBJS) gpfdist$(X)
 
 distclean: clean
 	rm -f fstream.c gfile.c GNUmakefile config.log config.status
-- 
GitLab