From 1f12a9a975a9c9d60c7f146d0098c80253d94d7d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 13 Apr 2025 15:16:06 +0900 Subject: DEB tde-style-qtcurve: clean up debian/rules Signed-off-by: Michele Calgaro --- .../themes/tde-style-qtcurve/debian/rules | 26 +++------------------- .../themes/tde-style-qtcurve/debian/rules | 26 +++------------------- 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/debian/_base/applications/themes/tde-style-qtcurve/debian/rules b/debian/_base/applications/themes/tde-style-qtcurve/debian/rules index 02999a177..a6797f19a 100755 --- a/debian/_base/applications/themes/tde-style-qtcurve/debian/rules +++ b/debian/_base/applications/themes/tde-style-qtcurve/debian/rules @@ -1,37 +1,17 @@ #!/usr/bin/make -f -PATH := /opt/trinity/bin:$(PATH) - -# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function -# Also include the main Trinity path -ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib -else -LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib -endif -export LD_LIBRARY_PATH - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_KDE_APIDOX := yes - -DEB_DH_STRIP_ARGS := --dbg-package=tde-style-qtcurve-trinity-dbg - -CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DLIB_SUFFIX="" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ - -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ - -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \ - -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DBUILD_ALL="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules index 02999a177..a6797f19a 100755 --- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules +++ b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules @@ -1,37 +1,17 @@ #!/usr/bin/make -f -PATH := /opt/trinity/bin:$(PATH) - -# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function -# Also include the main Trinity path -ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib -else -LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib -endif -export LD_LIBRARY_PATH - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_KDE_APIDOX := yes - -DEB_DH_STRIP_ARGS := --dbg-package=tde-style-qtcurve-trinity-dbg - -CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DLIB_SUFFIX="" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ - -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ - -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \ - -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DBUILD_ALL="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" -- cgit v1.2.3