X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=240c56e2f3a306043e655179aedbf9ab393313df;hb=e29867baf76f8e0f30cb44c4eb9f34dc72227efe;hp=52dd450ff31216a52cb62648c67624a2b60b2041;hpb=1b7910f6ae42bb20fe710adbdb596a2565457f6f;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 52dd450..240c56e 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -45,7 +45,7 @@ sbincfg_DATA = $(scripts_sbincfg_DTA) sbin_SCRIPTS = $(scripts_sbin_PRGS) $(src_sbin_SCRPTS) sbin_PROGRAMS = $(src_sbin_PRGS) noinst_PROGRAMS = $(test_PRGS) -noinst_DATA = $(contrib_DTA) +noinst_DATA = $(contrib_DTA) $(doc_DAT) initrd_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) @@ -95,7 +95,7 @@ endif linuxcaps.h: ${kernelincludedir}/linux/capability.h Makefile @rm -f $@ echo '#include ' >$@.tmp - sed -e 's!^#include .*!!g;s!\<__u32\>!uint32_t!g;s!\<__user\>!!g;' $< >>$@.tmp + $(SED) -e 's!^#include .*!!g;s!\<__u32\>!uint32_t!g;s!\<__user\>!!g;' $< >>$@.tmp @-chmod --reference $< $@.tmp &>/dev/null mv -f $@.tmp $@ @chmod a-w $@ @@ -141,8 +141,8 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ pathconfig.h: .pathconfig.h.pathsubst.stamp .%.pathsubst.stamp: %.pathsubst Makefile @mkdir -p $$(dirname '$@') - @echo "sed -e '...' $*.pathsubst >$*" - @sed -e '$(pathsubst_RULES)' '$<' >'$@.tmp' + @echo "$(SED) -e '...' $*.pathsubst >$*" + @$(SED) -e '$(pathsubst_RULES)' '$<' >'$@.tmp' @-chmod --reference='$<' '$@.tmp' @if cmp -s '$@.tmp' '$*'; then \ echo "... no changes, reusing old version"; \ @@ -157,11 +157,26 @@ pkgstatedir = $(localstatedir)/run/vservers pkgstaterevdir = $(pkgstatedir).rev vserverpkgdir = $(vserverdir)/.pkg -install-data-hook: +fix_SCRPTS = $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \ + $(addprefix $(legacydir)/, $(notdir $(legacy_SCRIPTS))) \ + $(addprefix $(sbindir)/, $(notdir $(sbin_SCRIPTS))) + +install-data-hook: install-fix-script-paths install-create-dirs + +install-create-dirs: $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstaterevdir) $(mkinstalldirs) -m 755 $(DESTDIR)$(confdefaultsdir)/{apps/pkgmgmt,files} - f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -s '$(vserverdir)' "$$f" - f=$(DESTDIR)$(confdefaultsdir)/run.rev; test -e "$$f" || ln -s '$(pkgstaterevdir)' "$$f" + f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)' "$$f" + f=$(DESTDIR)$(confdefaultsdir)/run.rev; test -e "$$f" || ln -sf '$(pkgstaterevdir)' "$$f" + +install-fix-script-paths: + test "/usr/lib/util-vserver" = "$(pkglibdir)" || \ + for i in $(fix_SCRPTS); do \ + f="$(DESTDIR)$$i"; \ + $(SED) -e 's!/usr/lib/util-vserver!$(pkglibdir)!g' "$$f" >"$$f.tmp"; \ + $(CMP) -s "$$f.tmp" "$$f" || cat "$$f.tmp" >"$$f"; \ + rm -f "$$f.tmp"; \ + done install-vserverdir: $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir)