X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=77f5409e3a85d26298aee9c519f7a55f3c435de1;hb=4e43a337b05011cc912f880ac25e68276756d6e0;hp=9c085e89e1f646f844489739d927a49651ca112b;hpb=e2ba9eff3ab39d5fd07123d7d37969235ce857c4;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 9c085e8..77f5409 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -42,6 +42,8 @@ noinst_PROGRAMS = $(test_PRGS) sysv_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) +DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) + BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h man_MANS = $(man_DATMAN) @@ -61,6 +63,10 @@ CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) $(BUILT_SOURCES) \ .*.pathsubst.stamp */.*.pathsubst.stamp \ linuxcaps.h pathconfig.h +AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = $(src_OPTIONS_EXEMPT) \ + $(scripts_OPTIONS_EXEMPT) \ + $(sysv_OPTIONS_EXEMPT) + if USE_DIETLIBC DIET = diet DIET_FLAGS = @@ -74,29 +80,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'; \ @@ -109,6 +116,11 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp install-data-local: $(INSTALL) -d -m755 $(DESTDIR)$(localstatedir)/run/vservers +if USE_DIETLIBC +$(addsuffix $(EXEEXT), $(DIETPROGS)) \ +$(addsuffix $(OBJEXT), $(DIETPROGS)) \ + : CC=$(DIET_CC) +endif include $(top_srcdir)/lib/Makefile-files include $(top_srcdir)/src/Makefile-files