From: Enrico Scholz Date: Thu, 30 Oct 2003 00:39:32 +0000 (+0000) Subject: reorganized make-file to cope with substituted perl-scripts X-Git-Tag: version_0_23_96~19 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=911c9741e9f3016970e900f9af919e26af9cd2ef;p=util-vserver.git reorganized make-file to cope with substituted perl-scripts git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/branches/SYSCALL_SWITCH@308 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 4010485..374a0f1 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -27,7 +27,7 @@ noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h lib_LIBRARIES = $(lib_lib_LIBS) -pkglib_SCRIPTS = $(distrib_SCRPTS) $(scripts_SCRPTS) +pkglib_SCRIPTS = $(distrib_SCRPTS) $(scripts_SCRPTS) $(src_pkglib_SCRPTS) pkglib_DATA = $(distrib_DAT) $(scriptscfg_DATA) pkglib_PROGRAMS = $(src_pkglib_PRGS) @@ -46,7 +46,7 @@ man_MANS = $(man_DATMAN) EXTRA_DIST = $(distrib_SCRPTS) $(distrib_DAT) \ $(sysv_XTRAS) $(sysv_CFG) \ $(doc_DAT) $(man_DATMAN) \ - $(scripts_SCRPTS) $(scripts_PRGS) $(scripts_XTRAS) \ + $(scripts_SCRPTS) $(scripts_XTRAS) \ vserver.spec newvserver.defaults \ m4/ensc_cflags.m4 \ THANKS diff --git a/util-vserver/scripts/Makefile-files b/util-vserver/scripts/Makefile-files index da8e692..e598dbc 100644 --- a/util-vserver/scripts/Makefile-files +++ b/util-vserver/scripts/Makefile-files @@ -19,7 +19,7 @@ scriptscfgdir = $(sbindir) -scripts_SCRPTS = scripts/distrib-info \ +scripts_src_SCRPTS = scripts/distrib-info \ scripts/rootshell \ scripts/save_s_context \ scripts/vprofile \ @@ -27,24 +27,34 @@ scripts_SCRPTS = scripts/distrib-info \ scripts/vservers.grabinfo.sh \ scripts/vsysvwrapper \ scripts/vunify.old.sh +scripts_gen_SCRPTS = -scripts_PRGS = scripts/vkill \ - scripts/vps \ - scripts/vpstree \ +scripts_src_PRGS = scripts/vpstree \ scripts/vrpm \ scripts/vserver \ scripts/vserver-copy \ scripts/vtop +scripts_gen_PRGS = scripts/vkill \ + scripts/vps + +scripts_PRGS = $(scripts_src_PRGS) $(scripts_gen_PRGS) scriptscfg_DATA = scripts/util-vserver-vars +scripts_SCRPTS = $(scripts_src_SCRPTS) $(scripts_gen_SCRPTS) + +scripts_XTRAS = scripts/util-vserver-vars.subst \ + scripts/vkill.subst \ + scripts/vps.subst \ + $(scripts_src_SCRPTS) $(scripts_src_PRGS) -scripts_XTRAS = scripts/util-vserver-vars.subst -scripts_GENSCRPTS = scripts/util-vserver-vars +scripts_GENSCRPTS = scripts/util-vserver-vars \ + $(scripts_gen_SCRPTS) $(scripts_gen_PRGS) scripts/%: scripts/%.subst @mkdir -p $$(dirname '$@') sed -e 's!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'SBINDIR'@!$(sbindir)!g' '$<' >'$@.tmp' + @-chmod --reference='$<' '$@.tmp' @-rm -f '$@' mv '$@.tmp' '$@' @chmod a-w '$@'