From: Enrico Scholz Date: Tue, 30 Sep 2003 15:58:39 +0000 (+0000) Subject: updated to new -devel branch X-Git-Tag: VERSION_0_10~1345 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c29d7bcb9f9458a98f701b7fb0129495d8c06bc;p=util-vserver.git updated to new -devel branch added dietlibc support git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@9 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 8c34f66..a466273 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4 sysvdir = $(sysconfdir)/init.d -vservercfgdir = $(sysconfdir)/vservers +confdir = $(sysconfdir)/vservers include_HEADERS = $(lib_HDRS) noinst_HEADERS = $(src_HDRS) @@ -37,7 +37,7 @@ noinst_PROGRAMS = $(test_PRGS) sysv_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) -vservercfg_DATA = newvserver.defaults +conf_DATA = newvserver.defaults BUILT_SOURCES = linuxcaps.h @@ -56,6 +56,11 @@ AM_CFLAGS = -Wall -pedantic CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) linuxcaps.h +if USE_DIETLIBC +DIET = diet +DIET_FLAGS = +DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) +endif linuxcaps.h: ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h