提交 9f707e1e 编写于 作者: D Daniel Gustafsson

Assorted gpMgmt/bin Makefile fixups

The tree I was working off clearly had stale files, which led me to
include two utils which were removed some time ago: gpcheckutil.py
and gpcheck.py. Remove these two from their respective Makefiles.

Also fix a Bash error in the Stream symlink test, the logoical AND
requires [[ .. ]]; rather than [ .. ];.

Both of these spotted while repeatedly running make install with
trees in various states.
上级 18f904a7
......@@ -7,7 +7,7 @@ SUBDIRS= commands data db gpMgmttest operations programs system util
$(recurse)
PROGRAMS= gparray.py gpcheckutil.py gpunit unit2
PROGRAMS= gparray.py gpunit unit2
DATA= __init__.py datetimeutils.py fault_injection.py gp_era.py gpcatalog.py \
gphostcache.py gplog.py gpparseopts.py gpresgroup.py gpsubprocess.py \
......
......@@ -5,7 +5,7 @@ include $(top_builddir)/src/Makefile.global
PROGRAMS= initstandby.py test_utils_helper.py
DATA= __init__.py buildMirrorSegments.py deletesystem.py gpcheck.py package.py \
DATA= __init__.py buildMirrorSegments.py deletesystem.py package.py \
rebalanceSegments.py reload.py segment_reconfigurer.py startSegments.py \
unix.py utils.py
......
......@@ -19,7 +19,7 @@ installdirs:
install: stream installdirs
$(INSTALL_PROGRAM) stream$(X) '$(DESTDIR)$(bindir)/lib/stream$(X)'
# Symlink bin/lib/stream to bin/stream to maintain backward compatibility
if [ ! -f $(DESTDIR)$(bindir)/stream/stream$(X) && ! -L $(DESTDIR)$(bindir)/stream/stream$(X) ]; then \
if [[ ! -f $(DESTDIR)$(bindir)/stream/stream$(X) && ! -L $(DESTDIR)$(bindir)/stream/stream$(X) ]]; then \
$(LN_S) $(DESTDIR)$(bindir)/lib/stream$(X) $(DESTDIR)$(bindir)/stream/stream$(X); \
fi
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册