X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=191b60d08cbfd7f554e25c33cd5d52b1713b088a;hb=ac67e993c261ae4bce7570d52d937533b75d3d51;hp=82c3ffed26e37b811cb5054e9249162a804e0566;hpb=745b95ee56b3e3dda29eaab6bd48c8ebf9b83ac8;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 82c3ffe..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 @@ -38,23 +41,25 @@ noinst_PROGRAMS = $(test_PRGS) sysv_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) -conf_DATA = newvserver.defaults -BUILT_SOURCES = linuxcaps.h +BUILT_SOURCES = linuxcaps.h pathconfig.h man_MANS = $(man_DATMAN) EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ $(doc_DAT) $(man_DATMAN) \ $(scripts_SCRPTS) $(scripts_PRGS) $(scripts_XTRAS) \ - vserver.spec newvserver.defaults \ + pathconfig.h.pathsubst \ + util-vserver.spec \ m4/ensc_cflags.m4 \ THANKS -AM_CPPFLAGS = -I $(top_srcdir)/lib -D VERSION=\"$(VERSION)\" -D PKGLIBDIR=\"$(pkglibdir)\" -D _GNU_SOURCE +AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE AM_CFLAGS = -Wall -pedantic -CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) linuxcaps.h +CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) \ + .*.pathsubst.stamp */.*.pathsubst.stamp \ + linuxcaps.h pathconfig.h if USE_DIETLIBC DIET = diet @@ -63,7 +68,18 @@ DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) endif linuxcaps.h: - ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h + ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h + +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 '$*' + @touch '$@' include $(top_srcdir)/lib/Makefile-files