[Pkg-kde-commits] rev 707 - branches/kde-3.4.0/cdbs

[Daniel Schepler]

Author: schepler
Date: 2005-03-06 01:42:10 +0100 (Sun, 06 Mar 2005)
New Revision: 707

Modified:
   branches/kde-3.4.0/cdbs/kde.mk
Log:
Changes to make kde.mk work with tarball.mk

Modified: branches/kde-3.4.0/cdbs/kde.mk
===================================================================
--- branches/kde-3.4.0/cdbs/kde.mk	2005-03-05 23:31:24 UTC (rev 706)
+++ branches/kde-3.4.0/cdbs/kde.mk	2005-03-06 00:42:10 UTC (rev 707)
@@ -30,12 +30,16 @@
 
 include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
 
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
 	if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
-		$(MAKE) -f admin/Makefile.common; \
+		$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common; \
 	fi
 	touch debian/stamp-cvs-make
 
@@ -89,7 +93,8 @@
 	 rm -f debian/stamp-man-pages
 
 clean::
-	if test -n "$(DEB_KDE_CVS_MAKE)"; then \
+	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 \
@@ -115,12 +120,12 @@
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd debian/tmp/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
 	  pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 	  echo Building $$pkg HTML docs...; \
 	  mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
 	  cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
-	  meinproc $(CURDIR)/debian/tmp/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	  meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
 	done
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: