From 5ed60302dd89b8592c3d1d6ca20697f69a3d0f80 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 26 Mar 2004 07:23:12 +0000 Subject: [PATCH] cleanups and enhancements in the directory installation rules git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1357 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/Makefile.am | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index f33e1a6..03fcd27 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -180,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))) \ @@ -192,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" @@ -206,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 -- 1.8.1.5