X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sysv%2FMakefile-files;h=f71d19e886a6bc8fb4fa28e973d00c1071d59185;hb=5ae3c1e4d541e3d0ec21691656d45a44e48c4530;hp=338a782fd45436ef0ce119713f174d50bafe3071;hpb=06e1018272502e1d15d6d8f32b80fa96420785b8;p=util-vserver.git

diff --git a/sysv/Makefile-files b/sysv/Makefile-files
index 338a782..f71d19e 100644
--- a/sysv/Makefile-files
+++ b/sysv/Makefile-files
@@ -1,4 +1,4 @@
-## $Id: Makefile-files,v 1.1.4.2 2003/10/30 15:16:30 ensc Exp $  -*- makefile -*-
+## $Id: Makefile-files 2483 2007-02-01 12:56:20Z dhozac $  -*- makefile -*-
 
 ## Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 ##  
@@ -17,43 +17,57 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ##  
 
-sysv_XTRAS		=  sysv/rebootmgr.subst \
-			   sysv/v_gated.subst \
-			   sysv/v_httpd.subst \
-			   sysv/v_named.subst \
-			   sysv/v_portmap.subst \
-			   sysv/v_sendmail.subst \
-			   sysv/v_smb.subst \
-			   sysv/v_sshd.subst \
-			   sysv/v_xinetd.subst \
-			   sysv/vservers.subst
-
-sysv_GENSCRPTS		=  sysv/rebootmgr \
-			   sysv/v_gated \
-			   sysv/v_httpd \
-			   sysv/v_named \
-			   sysv/v_portmap \
-			   sysv/v_sendmail \
-			   sysv/v_smb \
-			   sysv/v_sshd \
-			   sysv/v_xinetd \
-			   sysv/vservers
-
-sysv_SCRPTS		=  $(sysv_GENSCRPTS)
-
-sysv_CFG		=  sysv/vservers.conf
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT +=	\
+			$(sysv_src_SCRPTS) \
+			$(sysv_gen_SCRPTS)
 
+sysv_src_SCRPTS =	sysv/rebootmgr \
+			sysv/vprocunhide \
+			sysv/vservers-default \
+			sysv/vservers-legacy \
+			sysv/util-vserver \
+			sysv/vip6-autod
+sysv_gen_SCRPTS =	sysv/v_gated \
+			sysv/v_httpd \
+			sysv/v_named \
+			sysv/v_portmap \
+			sysv/v_sendmail \
+			sysv/v_smb \
+			sysv/v_sshd \
+			sysv/v_xinetd
+sysv_conf_DTA =		sysv/vservers.conf
+
+EXTRA_DIST +=		sysv/v_gated.subst \
+			sysv/v_httpd.subst \
+			sysv/v_named.subst \
+			sysv/v_portmap.subst \
+			sysv/v_sendmail.subst \
+			sysv/v_smb.subst \
+			sysv/v_sshd.subst \
+			sysv/v_xinetd.subst \
+			$(sysv_src_SCRPTS) \
+			$(sysv_conf_DTA)
+
+if HAVE_SYSV_INIT
+sysconf_DATA +=		$(sysv_conf_DTA)
+initrd_SCRIPTS +=	$(sysv_src_SCRPTS) \
+			$(sysv_gen_SCRPTS)
+endif
+
+CLEANFILES +=		$(sysv_gen_SCRPTS)
+
+sysv_SUBSTRULE =	s!/usr/lib/util-vserver!$(pkglibdir)!g; \
+			s!^USR_SBIN=/usr/sbin$$!USR_SBIN=$(sbindir)!g; \
+                        s!^DEFAULT_VSERVERDIR=/vservers$$!DEFAULT_VSERVERDIR=$(vserverdir)!g
 
 sysv/%:			sysv/%.subst
 			@mkdir -p $$(dirname '$@')
-			sed -e 's!/usr/lib/util-vserver!$(pkglibdir)!g; \
-				s!^USR_SBIN=/usr/sbin$$!USR_SBIN=$(sbindir)!g; \
-                                s!^VROOTDIR=/vservers$$!VROOTDIR=$(vserverdir)!g; \
-			       ' '$<' >'$@.tmp'
-			if cmp -s '$<' '$@.tmp'; then \
+			sed -e '$(sysv_SUBSTRULE)' '$<' >'$@.tmp'
+			@rm -f '$@'
+			@if cmp -s '$<' '$@.tmp'; then \
 				cp -p '$<' '$@'; \
 			else \
 				mv -f '$@.tmp' '$@'; \
 			fi
-			-rm -f '$@.tmp'
+			@rm -f '$@.tmp'
 			@chmod a-w '$@'