X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=df3ac84b17d38c22b4bdea71a08b29c25df4b084;hb=6fdd928b39e7453db43ec624d7d29fd58df5b66a;hp=dd84249f47c6b054c62243dfa1469a722fff84b1;hpb=bd2f6b7c8a7cf44e7ef58f246e2ae4cda9c86b58;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index dd84249..df3ac84 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 @@ -29,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) @@ -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,36 @@ 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; \ + @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 - @chmod a-w '$@' + 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!@'NICE'@!$(NICE)!g; \ + s!@'VCONFIG'@!$(VCONFIG)!g; \ + s!@'WC'@!$(WC)!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 '$@' include $(top_srcdir)/lib/Makefile-files