diff --git a/GNUmakefile.in b/GNUmakefile.in index 2e95bfab4..cc5a7b9b0 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -102,7 +102,7 @@ install: @if test -d contrib/gms_stats; then $(MAKE) -C contrib/gms_stats $@; fi @if test -d contrib/gms_profiler; then $(MAKE) -C contrib/gms_profiler $@; fi @if test -d contrib/gms_output; then $(MAKE) -C contrib/gms_output $@; fi - @if test -d contrib/timescaledb; then export CC=${GCC_PATH}/gcc/bin/gcc; export CXX=${GCC_PATH}/gcc/bin/g++; (cd contrib/timescaledb && ./run_to_build.sh && cd build && $(MAKE) $@); fi + @if test -d contrib/timescaledb; then (./contrib/timescaledb/run_to_build.sh && $(MAKE) -C contrib/timescaledb/build $@); fi +@echo "openGauss installation complete." endif endif diff --git a/build/script/utils/make_compile.sh b/build/script/utils/make_compile.sh index 1b1f906dc..c75514c71 100644 --- a/build/script/utils/make_compile.sh +++ b/build/script/utils/make_compile.sh @@ -240,11 +240,6 @@ function install_gaussdb() fi fi fi - -#tsdb prepare - if [ -d "$CODE_BASE/contrib/timescaledb" ]; then - cp $CODE_BASE/contrib/timescaledb/og-timescaledb1.7.4.sql ${GAUSSHOME}/share/postgresql/extension/timescaledb--1.7.4.sql - fi cd "$ROOT_DIR/contrib/pg_upgrade_support" make clean >> "$LOG_FILE" 2>&1