Fix use of dosym with directory destination.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index a58b01bda78758b5f6f1ee3c990ce943dae463eb..32d92e0205aefda155545d8d6212096faaf988db 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.71 2012/01/05 22:42:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.72 2012/01/05 23:20:02 mgorny Exp $
+
+  05 Jan 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+  Fix use of dosym with directory destination.
 
   05 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Add AUTOTOOLS_AUTORECONF for bug #392073.

diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 4d8e3e1e856314d82391637eda9b30bf10b019da..6b94a558c2d0e10a571ed8f81e4dd4603774c053 100644 (file)
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.9 2011/09/17 13:48:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.10 2012/01/05 23:20:02 mgorny Exp $
 
 # @ECLASS: systemd.eclass
 # @MAINTAINER:
@@ -105,9 +105,10 @@ systemd_enable_service() {
        local target=${1}
        local service=${2}
        local ud=$(_systemd_get_unitdir)
+       local destname=$(basename "${service}")
 
        dodir "${ud}"/"${target}".wants && \
-       dosym ../"${service}" "${ud}"/"${target}".wants
+       dosym ../"${service}" "${ud}"/"${target}".wants/"${destname}"
 }
 
 # @FUNCTION: systemd_with_unitdir