From 971b00b04e026f6115aa1155b483a12f1768e2be Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 28 Nov 2011 15:25:23 -0600 Subject: Fix abakus build on Debian and Ubuntu --- debian/lenny/applications/abakus/debian/control | 2 +- debian/lenny/applications/abakus/debian/rules | 46 ++++++++++++------------- 2 files changed, 23 insertions(+), 25 deletions(-) (limited to 'debian/lenny/applications/abakus') diff --git a/debian/lenny/applications/abakus/debian/control b/debian/lenny/applications/abakus/debian/control index 2596da72b..edfc1c7b0 100644 --- a/debian/lenny/applications/abakus/debian/control +++ b/debian/lenny/applications/abakus/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Steffen Joeris -Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), scons (>= 0.96), imagemagick, tdelibs4-trinity-dev, chrpath, bison, flex +Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, tdelibs4-trinity-dev, chrpath, bison, flex Standards-Version: 3.8.4 Package: abakus-trinity diff --git a/debian/lenny/applications/abakus/debian/rules b/debian/lenny/applications/abakus/debian/rules index b434be427..10ec1e1b3 100755 --- a/debian/lenny/applications/abakus/debian/rules +++ b/debian/lenny/applications/abakus/debian/rules @@ -1,41 +1,39 @@ #!/usr/bin/make -f +# 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/langcore.mk +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk + +DEB_KDE_APIDOX := yes -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_CMAKE_EXTRA_FLAGS := -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_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -SCONS = scons --no-cache -Q -DEB_INSTALL_DOCS_ALL = -DEB_COMPRESS_EXCLUDE = .docbook +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true -debian/abakus.xpm: src/hi64-app-abakus.png +debian/abakus.xpm: icons/hi64-app-abakus.png convert -resize 32 $< $@ -common-build-arch:: build-stamp -build-stamp: debian/abakus.xpm - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(SCONS) configure prefix=/opt/trinity - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(SCONS) - touch build-stamp +common-build-arch:: debian/abakus.xpm common-install-arch:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(SCONS) install install -D -m 644 debian/abakus.xpm debian/abakus-trinity/opt/trinity/share/pixmaps/abakus.xpm chrpath -d debian/abakus-trinity/opt/trinity/bin/abakus dh_icons -pabakus clean:: - #env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(SCONS) --clean rm -f debian/abakus.xpm - rm -rf cache - rm -rf .sconf_temp - rm -f bksys/generic.pyc - rm -f bksys/abakus.pyc - rm -f bksys/help.pyc - rm -f bksys/kde.pyc - rm -f config.log -- cgit v1.2.3