[Pkg-octave-commit] r1570 - in octave-pkg-dev/trunk: . debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-04-05 15:58:53 +0000 (Sat, 05 Apr 2008)
New Revision: 1570

Modified:
   octave-pkg-dev/trunk/debian/changelog
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
Install doc/* files using dh_installdocs; also, remove the
documentation files installed elsewhere



Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog	2008-04-05 15:39:17 UTC (rev 1569)
+++ octave-pkg-dev/trunk/debian/changelog	2008-04-05 15:58:53 UTC (rev 1570)
@@ -1,10 +1,12 @@
 octave-pkg-dev (0.5.4) UNRELEASED; urgency=low
 
-  * octave-pkg.mk.in: Remove packinfo/ChangeLog after pkg install. Also,
-    create a new rule clean-files for doing that and removing the COPYING
-    file.
+  * octave-pkg.mk.in:
+    + (clean-files) Remove packinfo/ChangeLog and packinfo/COPYING after
+       pkg install
+    + (install-docs) Install doc/* files using dh_installdocs; also,
+      remove the documentation files installed elsewhere
 
- -- Rafael Laboissiere <rafael at debian.org>  Sat, 05 Apr 2008 17:38:15 +0200
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 05 Apr 2008 17:58:15 +0200
 
 octave-pkg-dev (0.5.3) unstable; urgency=low
 

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-04-05 15:39:17 UTC (rev 1569)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-04-05 15:58:53 UTC (rev 1570)
@@ -32,7 +32,13 @@
 apiversion = $(shell octave-config -p API_VERSION)
 octave_options = --norc --no-history --silent --no-site-file
 
-install/$(package):: create-dirs install-pkg clean-files check-pkg remove-dirs
+install/$(package)::	\
+	create-dirs	\
+	install-pkg	\
+	clean-files	\
+	install-docs	\
+	check-pkg	\
+	remove-dirs
 
 .PHONY: create-dirs
 create-dirs:
@@ -55,6 +61,17 @@
 	$(shrpkg)/dh/octave-pkg-helper
 	dh_install --package=$(package)
 
+.PHONY: clean-files
+clean-files::
+	( cd  $(shell find . -name packinfo) ; rm -f COPYING ChangeLog )
+
+.PHONY: install-docs
+install-docs:
+	if [ -d doc ] ; then				\
+		dh_installdocs -p$(package) doc/*;	\
+		rm -rf $(debpkg)/$(mpath)/*/doc ;	\
+	fi
+
 .PHONY: check-pkg
 check-pkg:
 	-[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak
@@ -85,9 +102,6 @@
 		 $(CURDIR)/$(debpkg)/$(mpath)	\
 		 $(CURDIR)/$(debpkg)/$(bpath)
 
-.PHONY: clean-files
-clean-files::
-	( cd  $(shell find . -name packinfo) ; rm -f COPYING ChangeLog )
 
 DEB_MAKE_CLEAN_TARGET = -C src clean