[Minor] Remove bogus DEBIAN_BUILD constant

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d384fa1b156258eeeb3ddc8ebc6d0e5bd0232b5..6daced05a284193109a714866107f6d9d132ae22 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -798,13 +798,11 @@ ADD_CUSTOM_TARGET(dist ${CMAKE_SOURCE_DIR}/dist.sh
         COMMENT "Create source distribution"
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
-IF (NOT DEBIAN_BUILD)
-    ADD_CUSTOM_TARGET(check DEPENDS rspamd-test-cxx rspamd-test)
-    ADD_CUSTOM_TARGET(run-test DEPENDS check
-            COMMAND test/rspamd-test-cxx
-            COMMAND sh -c 'LUA_PATH="${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua"
-            test/rspamd-test -p /rspamd/lua')
-ENDIF (NOT DEBIAN_BUILD)
+ADD_CUSTOM_TARGET(check DEPENDS rspamd-test-cxx rspamd-test)
+ADD_CUSTOM_TARGET(run-test DEPENDS check
+        COMMAND test/rspamd-test-cxx
+        COMMAND sh -c 'LUA_PATH="${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua"
+        test/rspamd-test -p /rspamd/lua')
 
 
 # PVS Studio

diff --git a/debian/rules b/debian/rules
index 74771ede3442ba698c45908b2ee25b19a409bfd7..be06aa6d632d6f04ebfb7db921d5954b23c5cc21 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ configure_%:
                -DSYSTEMDDIR=/lib/systemd/system \
                -DCMAKE_INSTALL_PREFIX:PATH=/usr \
                -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-               -DDEBIAN_BUILD=1 \
+               -DNO_TARGET_VERSIONS=1 \
                -DENABLE_PCRE2=ON \
                -DENABLE_LIBUNWIND=ON \
                -DWANT_SYSTEMD_UNITS=ON \

diff --git a/rpm/rspamd.spec b/rpm/rspamd.spec
index 7a1a15c92d5ee0ecfdf50fb70556e8a9485f9fae..0727d2430638b7ce613d297543cfba6deedac7c2 100644 (file)
--- a/rpm/rspamd.spec
+++ b/rpm/rspamd.spec
@@ -136,7 +136,7 @@ rm -f %{_builddir}/luajit-build/lib/*.so || true
         -DSYSTEMDDIR=%{_unitdir} \
         -DWANT_SYSTEMD_UNITS=ON \
         -DNO_SHARED=ON \
-        -DDEBIAN_BUILD=1 \
+        -DNO_TARGET_VERSIONS=1 \
 %ifarch x86_64 amd64 arm64 aarch64
         -DENABLE_HYPERSCAN=ON \
 %endif

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1739177036e7a7b686bf5cc99a7713c3bdebab38..f7fdcef7be4fc2f7581866a936466cda9d311ea2 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -235,9 +235,9 @@ ADD_EXECUTABLE(rspamd ${RSPAMDSRC} ${CMAKE_CURRENT_BINARY_DIR}/workers.c ${CMAKE
 ADD_BACKWARD(rspamd)
 SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE CXX)
 SET_TARGET_PROPERTIES(rspamd-server PROPERTIES LINKER_LANGUAGE CXX)
-IF(NOT DEBIAN_BUILD)
+IF(NOT NO_TARGET_VERSIONS)
        SET_TARGET_PROPERTIES(rspamd PROPERTIES VERSION ${RSPAMD_VERSION})
-ENDIF(NOT DEBIAN_BUILD)
+ENDIF()
 
 #TARGET_LINK_LIBRARIES(rspamd ${RSPAMD_REQUIRED_LIBRARIES})
 TARGET_LINK_LIBRARIES(rspamd rspamd-server)

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index edf3cc1c49c1019bd43050839c070b206e459b38..543fc629cc193328554f0626b679d22b0c74e459 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -9,8 +9,8 @@ SET_TARGET_PROPERTIES(rspamc PROPERTIES COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/lib
 TARGET_LINK_LIBRARIES(rspamc rspamd-server)
 SET_TARGET_PROPERTIES(rspamc PROPERTIES LINKER_LANGUAGE CXX)
 
-IF(NOT DEBIAN_BUILD)
+IF(NOT NO_TARGET_VERSIONS)
        SET_TARGET_PROPERTIES(rspamc PROPERTIES VERSION ${RSPAMD_VERSION})
-ENDIF(NOT DEBIAN_BUILD)
+ENDIF()
 
 INSTALL(TARGETS rspamc RUNTIME DESTINATION bin)

diff --git a/src/rspamadm/CMakeLists.txt b/src/rspamadm/CMakeLists.txt
index 5e88ec8dd6d785a0d47efcc40e4a294a19973cdc..2f32a95f5e62c836c7b580ed264d12e0839b3db4 100644 (file)
--- a/src/rspamadm/CMakeLists.txt
+++ b/src/rspamadm/CMakeLists.txt
@@ -22,9 +22,9 @@ ENDIF()
 ADD_EXECUTABLE(rspamadm ${RSPAMADMSRC})
 TARGET_LINK_LIBRARIES(rspamadm rspamd-server)
 
-IF (NOT DEBIAN_BUILD)
+IF (NOT NO_TARGET_VERSIONS)
     SET_TARGET_PROPERTIES(rspamadm PROPERTIES VERSION ${RSPAMD_VERSION})
-ENDIF (NOT DEBIAN_BUILD)
+ENDIF ()
 
 SET_TARGET_PROPERTIES(rspamadm PROPERTIES LINKER_LANGUAGE CXX)
 ADD_BACKWARD(rspamadm)