From 9105191a46ff0e27dfafebd386a4d50c26c7f439 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Mon, 3 Nov 2003 20:49:42 +0000 Subject: [PATCH] conditionalized built of linuxconf-module git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/branches/SYSCALL_SWITCH@352 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/Makefile.am | 3 +-- util-vserver/linuxconf/Makefile-files | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 32d203e..acb2d06 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -45,9 +45,8 @@ man_MANS = $(man_DATMAN) $(linuxconf_DATMAN) EXTRA_DIST = $(distrib_SCRPTS) $(distrib_DAT) \ $(sysv_XTRAS) $(sysv_CFG) \ - $(doc_DAT) $(man_DATMAN) $(linuxconf_DATMAN) \ + $(doc_DAT) $(man_DATMAN) $(linuxconf_XTRAS) \ $(scripts_SCRPTS) $(scripts_XTRAS) \ - $(linuxconf_XTRAS) \ util-vserver.spec \ m4/ensc_cflags.m4 m4/ensc_kerneldir.m4 \ THANKS diff --git a/util-vserver/linuxconf/Makefile-files b/util-vserver/linuxconf/Makefile-files index d5edb0c..b2d397e 100644 --- a/util-vserver/linuxconf/Makefile-files +++ b/util-vserver/linuxconf/Makefile-files @@ -17,15 +17,21 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. linuxconf_gen_SCRPTS = linuxconf/newvserver -linuxconf_DATMAN = linuxconf/newvserver.8 -linuxconf_cfg_DTA = linuxconf/newvserver.defaults +linuxconf_src_DATMAN = linuxconf/newvserver.8 +linuxconf_cfg_src_DTA = linuxconf/newvserver.defaults linuxconf_XTRAS = linuxconf/newvserver.subst \ - $(linuxconf_cfg_DTA) + $(linuxconf_cfg_src_DTA) \ + $(linuxconf_src_DATMAN) -linuxconf_SCRPTS = $(linuxconf_gen_SCRPTS) linuxconf_GENFILES = $(linuxconf_gen_SCRPTS) + +if ENSC_ENABLE_LINUXCONF +linuxconf_DATMAN = $(linuxconf_src_DATMAN) +linuxconf_SCRPTS = $(linuxconf_gen_SCRPTS) +linuxconf_cfg_DTA = $(linuxconf_cfg_src_DTA) + linuxconf/%: linuxconf/%.subst @mkdir -p $$(dirname '$@') sed -e 's!@'PKGLIBDIR'@!$(pkglibdir)!g; \ @@ -34,3 +40,8 @@ linuxconf/%: linuxconf/%.subst @-rm -f '$@' mv '$@.tmp' '$@' @chmod a-w '$@' +else +linuxconf_DATMAN = +linuxconf_SCRPTS = +linuxconf_cfg_DTA = +endif -- 1.8.1.5