diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-11-24 09:58:29 +0100 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-11-24 09:58:29 +0100 |
| commit | 4398af173f2663445e824a79c6367adab62c83e1 (patch) | |
| tree | c478e10ad95d4b1bf18343e4f57f5764a52506e9 /ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk | |
| parent | 32fb770ae4ed0851491a59df5e23e27fb8afdadf (diff) | |
| parent | 22fd5fa79ac6b2be02017b6d19d95555eae61efb (diff) | |
| download | tde-packaging-4398af173f2663445e824a79c6367adab62c83e1.tar.gz tde-packaging-4398af173f2663445e824a79c6367adab62c83e1.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk')
| -rw-r--r-- | ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/tdetoys/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _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: +ifndef _cdbs_class_cmake 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; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -75,11 +77,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)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/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)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: @@ -96,6 +98,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -104,6 +107,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif |