From 5618a06ab598d329d4934ada15c15c8109346180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Mon, 3 Aug 2009 12:56:24 +0000 Subject: [PATCH] * Make it possible to specify doc directory's name via destDir parameter provided to pisitools.dodoc. --- ChangeLog | 4 ++++ pisi/actionsapi/pisitools.py | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ae3a3c7..85391406 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-08-03 Fatih Aşıcı + * Make it possible to specify doc directory's name via destDir + parameter provided to pisitools.dodoc. + 2009-06-30 Onur Küçük * Change default make job number from 1 to 3 in pisi defaults, sometimes it is forgotten and we need to see parallel build errors diff --git a/pisi/actionsapi/pisitools.py b/pisi/actionsapi/pisitools.py index a4689c93..80e08c1f 100644 --- a/pisi/actionsapi/pisitools.py +++ b/pisi/actionsapi/pisitools.py @@ -45,9 +45,10 @@ def dodir(destinationDirectory): '''creates a directory tree''' makedirs(join_path(get.installDIR(), destinationDirectory)) -def dodoc(*sourceFiles): +def dodoc(*sourceFiles, **kw): '''inserts the files in the list of files into /usr/share/doc/PACKAGE''' - readable_insinto(join_path(get.installDIR(), join_path('/usr/share/doc', get.srcNAME())), *sourceFiles) + destDir = kw.get("destDir", get.srcNAME()) + readable_insinto(join_path(get.installDIR(), join_path(get.docDIR(), destDir)), *sourceFiles) def doexe(sourceFile, destinationDirectory): '''insert a executable file into destination directory'''