removed some noise from the substrule
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 17 Oct 2003 21:01:06 +0000 (21:01 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 17 Oct 2003 21:01:06 +0000 (21:01 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@200 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/sysv/Makefile-files

index c1aaf13..4877d35 100644 (file)
@@ -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 '$@'