From ced1cdbd2950d8b7ffb82f8ebc4ebdbddac11dce Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Mon, 6 Oct 2003 19:48:12 +0000 Subject: [PATCH] - added more pathsubst variables - added $(scripts_DTA) git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@55 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/Makefile.am | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 191b60d..526fc47 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -32,7 +32,7 @@ noinst_HEADERS = $(src_HDRS) lib_LIBRARIES = $(lib_lib_LIBS) pkglib_SCRIPTS = $(scripts_SCRPTS) -pkglib_DATA = $(scriptscfg_DATA) +pkglib_DATA = $(scriptscfg_DATA) $(scripts_DTA) pkglib_PROGRAMS = $(src_pkglib_PRGS) sbin_SCRIPTS = $(scripts_PRGS) @@ -73,11 +73,24 @@ linuxcaps.h: pathconfig.h: .pathconfig.h.pathsubst.stamp .%.pathsubst.stamp: %.pathsubst Makefile @mkdir -p $$(dirname '$@') - sed -e 's!@'PKGLIBDIR'@!$(pkglibdir)!g; \ + @echo "sed -e '...' $*.pathsubst >$*" + @sed -e 's!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'SBINDIR'@!$(sbindir)!g; \ s!@'CONFDIR'@!$(confdir)!g; \ - s!@'SYSCONFDIR'@!$(sysconfdir)!g' '$<' >'$@.tmp' - if cmp -s '$@.tmp' '$*'; then rm -f '$@.tmp'; else rm -f '$*'; mv '$@.tmp' '$*'; fi + 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; \ + ' '$<' >'$@.tmp' + @if cmp -s '$@.tmp' '$*'; then \ + echo "... no changes, reusing old version"; \ + rm -f '$@.tmp'; \ + else \ + rm -f '$*'; mv '$@.tmp' '$*'; \ + fi @chmod a-w '$*' @touch '$@' -- 1.8.1.5