This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 168beb86a9c Fix some makefile
168beb86a9c is described below
commit 168beb86a9c01b1a47488af6f82d04f47725ffbe
Author: Jinbao Chen <[email protected]>
AuthorDate: Mon Sep 15 18:07:55 2025 +0800
Fix some makefile
---
src/Makefile | 10 ++--------
src/backend/nls.mk | 4 ----
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 252a54a10e4..7f544b03ea1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -69,25 +69,19 @@ clean:
$(MAKE) -C test $@
$(MAKE) -C tutorial NO_PGXS=1 $@
$(MAKE) -C test/isolation $@
-<<<<<<< HEAD
+ $(MAKE) -C tools/pg_bsd_indent $@
$(MAKE) -C test/thread $@
$(MAKE) -C $(MOCK_DIR) $@
$(MAKE) -C $(CMOCKERY_DIR) $@
-=======
- $(MAKE) -C tools/pg_bsd_indent $@
->>>>>>> REL_16_9
distclean maintainer-clean:
$(MAKE) -C test $@
$(MAKE) -C tutorial NO_PGXS=1 $@
$(MAKE) -C test/isolation $@
-<<<<<<< HEAD
+ $(MAKE) -C tools/pg_bsd_indent $@
$(MAKE) -C test/thread $@
$(MAKE) -C $(MOCK_DIR) $@
$(MAKE) -C $(CMOCKERY_DIR) $@
-=======
- $(MAKE) -C tools/pg_bsd_indent $@
->>>>>>> REL_16_9
rm -f Makefile.port Makefile.global
rm -f contrib/interconnect/Makefile.interconnect
diff --git a/src/backend/nls.mk b/src/backend/nls.mk
index 6bda17ddac4..8263527c851 100644
--- a/src/backend/nls.mk
+++ b/src/backend/nls.mk
@@ -1,9 +1,5 @@
# src/backend/nls.mk
CATALOG_NAME = postgres
-<<<<<<< HEAD
-AVAIL_LANGUAGES = de es fr it ja ko ru sv uk zh_CN
-=======
->>>>>>> REL_16_9
GETTEXT_FILES = + gettext-files
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) \
GUC_check_errmsg \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
