From 0786192239f71d857d7918f68cf64d1bfbb68c0d Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 1 Oct 2003 10:42:51 +0000 Subject: [PATCH] - added cvs2cl support - changed pathsubst rules so that files will not be updated on every 'make' anymore git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@37 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/Makefile.am | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index dd84249..191b60d 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -20,6 +20,9 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = . distrib +CVS2CL_AMFLAGS = $(CVS2CL_TAG) -U cvsusers.map +CVS2CL_ALLFLAGS := $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS) + sysvdir = $(sysconfdir)/init.d confdir = $(sysconfdir)/vservers @@ -55,6 +58,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE AM_CFLAGS = -Wall -pedantic CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) \ + .*.pathsubst.stamp */.*.pathsubst.stamp \ linuxcaps.h pathconfig.h if USE_DIETLIBC @@ -66,14 +70,16 @@ endif linuxcaps.h: ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h -%: %.pathsubst Makefile +pathconfig.h: .pathconfig.h.pathsubst.stamp +.%.pathsubst.stamp: %.pathsubst Makefile @mkdir -p $$(dirname '$@') 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 - @chmod a-w '$@' + if cmp -s '$@.tmp' '$*'; then rm -f '$@.tmp'; else rm -f '$*'; mv '$@.tmp' '$*'; fi + @chmod a-w '$*' + @touch '$@' include $(top_srcdir)/lib/Makefile-files -- 1.8.1.5