debian rules updateddebian/6.0.0-1

1 files changed, 20 insertions, 16 deletions

diff --git a/debian/rules b/debian/rules
index 120ac6a24b1..8bd339ce15b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,19 +13,23 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
 	DEB_SCONS_OPTIONS := --d=DEBUGBUILD
 endif
 
-ifeq (,$(filter nodbgsym,$(DEB_BUILD_OPTIONS)))
-       DEB_SCONS_OPTIONS += --nostrip
-endif
-
+#ifeq (,$(filter nodbgsym,$(DEB_BUILD_OPTIONS)))
+#       DEB_SCONS_OPTIONS += --nostrip
+#endif
+#
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
        PROCS=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
        DEB_SCONS_OPTIONS += -j$(PROCS)
 endif
 
-COMMON_OPTIONS = --use-system-tcmalloc --use-system-pcre \
+COMMON_OPTIONS = --use-system-tcmalloc \
+		 --use-system-pcre \
 		 --use-system-snappy \
-		 --use-system-zlib --use-system-valgrind \
-		 --use-system-stemmer --use-system-yaml \
+		 --use-system-zlib \
+		 --use-system-zstd \
+		 --use-system-valgrind \
+		 --use-system-stemmer \
+		 --use-system-yaml \
 		 --disable-warnings-as-errors \
 		 --ssl $(DEB_SCONS_OPTIONS) \
 		 CC=$(CC) CXX=$(CXX)
@@ -43,24 +47,24 @@ COMMON_OPTIONS += --wiredtiger=off
 endif
 
 override_dh_auto_clean:
-	scons --keep-going --clean $(COMMON_OPTIONS) .
+	scons MONGO_VERSION=6.0.0 --keep-going --clean $(COMMON_OPTIONS) .
 	find $(CURDIR)/ -name "*.pyc" -delete
 	rm -rf $(CURDIR)/debian/tmp-test/
 	rm -rf $(CURDIR)/.scons/
 	rm -rf $(CURDIR)/build/
 
 override_dh_auto_build:
-	scons $(COMMON_OPTIONS) core tools
+	scons MONGO_VERSION=6.0.0 $(COMMON_OPTIONS) install-all
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-override_dh_auto_test:
-	scons $(COMMON_OPTIONS) dbtest unittests
-	python ./buildscripts/resmoke.py --dbpathPrefix="$(CURDIR)/debian/tmp-test" --suites=dbtest,unittests
-.PHONY: override_dh_auto_test
-endif
+#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+#override_dh_auto_test:
+#	scons $(COMMON_OPTIONS) dbtest unittests
+#	python ./buildscripts/resmoke.py --dbpathPrefix="$(CURDIR)/debian/tmp-test" --suites=dbtest,unittests
+#.PHONY: override_dh_auto_test
+#endif
 
 override_dh_auto_install:
-	scons $(COMMON_OPTIONS) --prefix=$(CURDIR)/debian/tmp/usr install
+	scons MONGO_VERSION=6.0.0 $(COMMON_OPTIONS) DESTDIR=debian/tmp/ PREFIX=usr/ install-all
 
 override_dh_installsystemd:
 	dh_installsystemd -pmongodb-server --name=mongodb