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

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-04-28 00:03:31 +0000 (Thu, 28 Apr 2005)
New Revision: 1039

Modified:
   branches/kde-3.4.0/cdbs/debian-qt-kde.mk
   branches/kde-3.4.0/cdbs/kde.mk
Log:
Move apidox rules to kde.mk, since allee informs me that they'll be of
general utility.

Also add his minor "test" patch to debian-qt-kde.mk for consistency.

Thanks!


Modified: branches/kde-3.4.0/cdbs/debian-qt-kde.mk
===================================================================
--- branches/kde-3.4.0/cdbs/debian-qt-kde.mk	2005-04-27 23:45:56 UTC (rev 1038)
+++ branches/kde-3.4.0/cdbs/debian-qt-kde.mk	2005-04-28 00:03:31 UTC (rev 1039)
@@ -21,22 +21,9 @@
 	make -f admin/Makefile.common dist
 	debian/rules clean
 
-common-build-arch common-build-indep:: debian/stamp-apidox
-debian/stamp-apidox:
-	if test -n "$(DEB_KDE_APIDOX)"; then \
-		$(DEB_MAKE_INVOKE) apidox; \
-	fi
-	touch debian/stamp-apidox
-
-common-install-arch common-install-indep:: install-apidox
-install-apidox::
-	if test -n "$(DEB_KDE_APIDOX)"; then \
-		$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
-	fi
-
 common-build-arch:: debian/stamp-man-pages
 debian/stamp-man-pages:
-	[ -d debian/man/out ] || mkdir -p debian/man/out
+	if test -d debian/man/out; then mkdir -p debian/man/out; fi
 	for f in $$(find debian/man -name '*.sgml'); do \
 		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
 	done
@@ -50,7 +37,6 @@
 	rm -rf debian/man/out
 	-rmdir debian/man
 	rm -f debian/stamp-man-pages
-	rm -f debian/stamp-apidox
 	rm -rf debian/shlibs-check
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

Modified: branches/kde-3.4.0/cdbs/kde.mk
===================================================================
--- branches/kde-3.4.0/cdbs/kde.mk	2005-04-27 23:45:56 UTC (rev 1038)
+++ branches/kde-3.4.0/cdbs/kde.mk	2005-04-28 00:03:31 UTC (rev 1039)
@@ -65,4 +65,20 @@
 cleanbuilddir::
 	-if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
 
+common-build-arch common-build-indep:: debian/stamp-apidox
+debian/stamp-apidox:
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) apidox; \
+	fi
+	touch debian/stamp-apidox
+
+common-install-arch common-install-indep:: install-apidox
+install-apidox::
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
+	fi
+
+clean::
+	rm -f debian/stamp-apidox
+
 endif