From 13cf9da65c378a50e651a3dd7078f2dab0363f8c Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 17 Oct 2003 21:01:06 +0000 Subject: [PATCH] removed some noise from the substrule git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@200 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/sysv/Makefile-files | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/util-vserver/sysv/Makefile-files b/util-vserver/sysv/Makefile-files index c1aaf13..4877d35 100644 --- a/util-vserver/sysv/Makefile-files +++ b/util-vserver/sysv/Makefile-files @@ -44,14 +44,17 @@ sysv_SCRPTS = $(sysv_GENSCRPTS) sysv_CFG = sysv/vservers.conf +sysv_SUBSTRULE = s!/usr/lib/util-vserver!$(pkglibdir)!g; \ + s!^USR_SBIN=/usr/sbin$$!USR_SBIN=$(sbindir)!g + sysv/%: sysv/%.subst @mkdir -p $$(dirname '$@') - sed -e 's!/usr/lib/util-vserver!$(pkglibdir)!g; \ - s!^USR_SBIN=/usr/sbin$$!USR_SBIN=$(sbindir)!g' '$<' >'$@.tmp' - if cmp -s '$<' '$@.tmp'; then \ + sed -e '$(sysv_SUBSTRULE)' '$<' >'$@.tmp' + @rm -f '$@' + @if cmp -s '$<' '$@.tmp'; then \ cp -p '$<' '$@'; \ else \ mv -f '$@.tmp' '$@'; \ fi - -rm -f '$@.tmp' + @rm -f '$@.tmp' @chmod a-w '$@' -- 1.8.1.5