From ac48aa6bfddd2c4dc5aa89457626d7f7378dca34 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 17 Oct 2003 21:06:27 +0000 Subject: [PATCH] cleaned up pathsubst rule git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@209 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/Makefile.am | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 79aa390..07a7e1a 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -76,29 +76,30 @@ linuxvirtual.h: ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \ ln -sf '$(top_srcdir)/lib/virtual.h' '$@' +pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ + s!@'SBINDIR'@!$(sbindir)!g; \ + s!@'CONFDIR'@!$(confdir)!g; \ + s!@'SYSCONFDIR'@!$(sysconfdir)!g; \ + s!@'PACKAGE'@!$(PACKAGE)!g; \ + s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \ + s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!g; \ + s!@'PACKAGE_STRING'@!$(PACKAGE_STRING)!g; \ + s!@'PACKAGE_TARNAME'@!$(PACKAGE_TARNAME)!g; \ + s!@'PACKAGE_VERSION'@!$(PACKAGE_VERSION)!g; \ + s!@'AWK'@!$(AWK)!g; \ + s!@'GREP'@!$(GREP)!g; \ + s!@'IP'@!$(IP)!g; \ + s!@'MOUNT'@!$(MOUNT)!g; \ + s!@'UMOUNT'@!$(UMOUNT)!g; \ + s!@'NICE'@!$(NICE)!g; \ + s!@'VCONFIG'@!$(VCONFIG)!g; \ + s!@'WC'@!$(WC)!g + pathconfig.h: .pathconfig.h.pathsubst.stamp .%.pathsubst.stamp: %.pathsubst Makefile @mkdir -p $$(dirname '$@') @echo "sed -e '...' $*.pathsubst >$*" - @sed -e 's!@'PKGLIBDIR'@!$(pkglibdir)!g; \ - s!@'SBINDIR'@!$(sbindir)!g; \ - s!@'CONFDIR'@!$(confdir)!g; \ - s!@'SYSCONFDIR'@!$(sysconfdir)!g; \ - s!@'PACKAGE'@!$(PACKAGE)!g; \ - s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \ - s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!g; \ - s!@'PACKAGE_STRING'@!$(PACKAGE_STRING)!g; \ - s!@'PACKAGE_TARNAME'@!$(PACKAGE_TARNAME)!g; \ - s!@'PACKAGE_VERSION'@!$(PACKAGE_VERSION)!g; \ - s!@'AWK'@!$(AWK)!g; \ - s!@'GREP'@!$(GREP)!g; \ - s!@'IP'@!$(IP)!g; \ - s!@'MOUNT'@!$(MOUNT)!g; \ - s!@'UMOUNT'@!$(UMOUNT)!g; \ - s!@'NICE'@!$(NICE)!g; \ - s!@'VCONFIG'@!$(VCONFIG)!g; \ - s!@'WC'@!$(WC)!g; \ - ' '$<' >'$@.tmp' + @sed -e '$(pathsubst_RULES)' '$<' >'$@.tmp' @if cmp -s '$@.tmp' '$*'; then \ echo "... no changes, reusing old version"; \ rm -f '$@.tmp'; \ -- 1.8.1.5