summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-31 01:57:49 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-31 01:57:49 -0500
commit87402a68a2871ea46422eef2ee03dd9500ca0ca4 (patch)
tree5603d775e32bd791e224dbd131a4a474756308a9 /ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk
parentfd1d43a359914bca16591f17f5c63c4689164b13 (diff)
downloadtde-packaging-87402a68a2871ea46422eef2ee03dd9500ca0ca4.tar.gz
tde-packaging-87402a68a2871ea46422eef2ee03dd9500ca0ca4.zip
Fix up kdegraphics cmake build for Maverick
Diffstat (limited to 'ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk')
-rw-r--r--ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk17
1 files changed, 14 insertions, 3 deletions
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk
index 888f4be38..a5e510758 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,9 @@ _cdbs_class_debian-qt-kde := 1
# Note: This _must_ be included before autotools.mk, or it won't work.
common-configure-arch common-configure-indep:: debian/stamp-cvs-make
debian/stamp-cvs-make:
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
touch debian/stamp-cvs-make
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -21,7 +24,7 @@ DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+DEB_SHLIBDEPS_INCLUDE = /usr/lib/mesa $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/opt/trinity/lib)
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
@@ -72,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
if test -e debian/$(cdbs_curpkg).lintian; then \
install -p -D -m644 debian/$(cdbs_curpkg).lintian \
- debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \
fi
if test -e debian/$(cdbs_curpkg).presubj; then \
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
- debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \
fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
@@ -93,6 +96,14 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
done
clean::
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
rm -f debian/stamp-cvs-make
endif