isNumber(): added
[util-vserver.git] / util-vserver / Makefile.am
index 0100e90..83cef0e 100644 (file)
@@ -129,40 +129,42 @@ else
                        ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
 endif
 
-pathsubst_RULES                =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
-                          s!@'LEGACYDIR'@!$(legacydir)!g; \
-                          s!@'SBINDIR'@!$(sbindir)!g; \
-                          s!@'CONFDIR'@!$(confdir)!g; \
-                          s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
-                          s!@'PKGSTATEDIR'@!$(pkgstatedir)!g; \
-                          s!@'PKGSTATEREVDIR'@!$(pkgstaterevdir)!g; \
-                          s!@'VSERVERDIR'@!$(vserverdir)!g; \
-                          s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
-                          s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
-                          s!@'INITRDDIR'@!$(initrddir)!g; \
-                          s!@'LIBDIR'@!$(libdir)!g; \
-                          s!@'MANDIR'@!$(mandir)!g; \
-                          s!@'INCLUDEDIR'@!$(includedir)!g; \
-                          s!@'PACKAGE'@!$(PACKAGE)!g; \
-                          s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \
-                          s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!g; \
-                          s!@'PACKAGE_STRING'@!$(PACKAGE_STRING)!g; \
-                          s!@'PACKAGE_TARNAME'@!$(PACKAGE_TARNAME)!g; \
-                          s!@'PACKAGE_VERSION'@!$(PACKAGE_VERSION)!g; \
-                          s!@'AWK'@!$(AWK)!g; \
-                          s!@'GREP'@!$(GREP)!g; \
-                          s!@'IP'@!$(IP)!g; \
-                          s!@'MOUNT'@!$(MOUNT)!g; \
-                          s!@'UMOUNT'@!$(UMOUNT)!g; \
-                          s!@'NICE'@!$(NICE)!g; \
-                          s!@'VCONFIG'@!$(VCONFIG)!g; \
-                          s!@'PS'@!$(PS)!g; \
-                          s!@'WC'@!$(WC)!g; \
-                          s!@'WGET'@!$(WGET)!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; \
-                          s!@'ENSC_HAVE_CXX_COMPILER_FALSE'@!\@ENSC_HAVE_CXX_COMPILER_FALSE@ !g;
+pathsubst_RULES =      s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
+                       s!@'LEGACYDIR'@!$(legacydir)!g; \
+                       s!@'SBINDIR'@!$(sbindir)!g; \
+                       s!@'CONFDIR'@!$(confdir)!g; \
+                       s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
+                       s!@'PKGSTATEDIR'@!$(pkgstatedir)!g; \
+                       s!@'PKGSTATEREVDIR'@!$(pkgstaterevdir)!g; \
+                       s!@'VSERVERDIR'@!$(vserverdir)!g; \
+                       s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
+                       s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
+                       s!@'VSHELPERSTATEDIR'@!$(vshelperstatedir)!g; \
+                       s!@'INITRDDIR'@!$(initrddir)!g; \
+                       s!@'LIBDIR'@!$(libdir)!g; \
+                       s!@'MANDIR'@!$(mandir)!g; \
+                       s!@'INCLUDEDIR'@!$(includedir)!g; \
+                       s!@'PACKAGE'@!$(PACKAGE)!g; \
+                       s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \
+                       s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!g; \
+                       s!@'PACKAGE_STRING'@!$(PACKAGE_STRING)!g; \
+                       s!@'PACKAGE_TARNAME'@!$(PACKAGE_TARNAME)!g; \
+                       s!@'PACKAGE_VERSION'@!$(PACKAGE_VERSION)!g; \
+                       s!@'AWK'@!$(AWK)!g; \
+                       s!@'GREP'@!$(GREP)!g; \
+                       s!@'IP'@!$(IP)!g; \
+                       s!@'MOUNT'@!$(MOUNT)!g; \
+                       s!@'UMOUNT'@!$(UMOUNT)!g; \
+                       s!@'NICE'@!$(NICE)!g; \
+                       s!@'VCONFIG'@!$(VCONFIG)!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; \
+                       s!@'ENSC_HAVE_CXX_COMPILER_FALSE'@!\@ENSC_HAVE_CXX_COMPILER_FALSE@ !g;
 
 pathconfig.h:          .pathconfig.h.pathsubst.stamp
 .%.pathsubst.stamp:    %.pathsubst Makefile
@@ -179,9 +181,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 +194,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 +208,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