X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=03fcd27934d9bd300d72891fe884ed8068c21274;hb=daa68ab35cbf20d5e0dad9fa065c0b4673b7a8ff;hp=0100e90008498458a340b7927413421c429d3efb;hpb=b25de07725d07d53bb34da6adb93db27e29cc509;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 0100e90..03fcd27 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -159,6 +159,7 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'PS'@!$(PS)!g; \ s!@'WC'@!$(WC)!g; \ s!@'WGET'@!$(WGET)!g; \ + s!@'TAR'@!$(TAR)!g; \ s!@'ENSC_HAVE_C99_COMPILER_TRUE'@!\@ENSC_HAVE_C99_COMPILER_TRUE@ !g; \ s!@'ENSC_HAVE_C99_COMPILER_FALSE'@!\@ENSC_HAVE_C99_COMPILER_FALSE@ !g; \ s!@'ENSC_HAVE_CXX_COMPILER_TRUE'@!\@ENSC_HAVE_CXX_COMPILER_TRUE@ !g; \ @@ -179,9 +180,10 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @chmod a-w '$*' @touch '$@' -pkgstatedir = $(localstatedir)/run/vservers -pkgstaterevdir = $(pkgstatedir).rev -vserverpkgdir = $(vserverdir)/.pkg +pkgstatedir = $(localstatedir)/run/vservers +pkgstaterevdir = $(pkgstatedir).rev +vserverpkgdir = $(vserverdir)/.pkg +vshelperstatedir = $(localstatedir)/run/vshelper fix_SCRPTS = $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \ $(addprefix $(legacydir)/, $(notdir $(legacy_SCRIPTS))) \ @@ -191,8 +193,8 @@ fix_SCRPTS = $(addprefix $(pkglibdir)/, $(notdir $(pkglib_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} + $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstaterevdir) $(DESTDIR)$(vshelperstatedir) + $(mkinstalldirs) -m 755 $(DESTDIR)$(confdefaultsdir) f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)' "$$f" f=$(DESTDIR)$(confdefaultsdir)/run.rev; test -e "$$f" || ln -sf '$(pkgstaterevdir)' "$$f" @@ -205,7 +207,13 @@ install-fix-script-paths: rm -f "$$f.tmp"; \ done -install-vserverdir: +install-distribution: _install-vserverdir _install-vshelperlink + +_install-vshelperlink: + $(mkinstalldirs) $(DESTDIR)/sbin + ln -sf ..$(pkglibdir)/vshelper $(DESTDIR)/sbin/vshelper + +_install-vserverdir: $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir) if USE_DIETLIBC