use 'exec-cd' instead of 'secure-umount'
[util-vserver.git] / util-vserver / Makefile.am
index f265b53..2adbf36 100644 (file)
 ACLOCAL_AMFLAGS                =  -I m4
 SUBDIRS                        =  . distrib
 
-CVS2CL_AMFLAGS         =  $(CVS2CL_TAG) -U cvsusers.map
+CVS2CL_AMFLAGS         =  $(CVS2CL_TAG) -U cvsusers.map --show-dead
 CVS2CL_ALLFLAGS        :=  $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS)
 
 confdir                        =  $(sysconfdir)/vservers
+confdefaultsdir                =  $(confdir)/.defaults
 sbincfgdir             =  $(sbindir)
 
 include_HEADERS                =  $(lib_HDRS)
@@ -54,13 +55,17 @@ man_MANS            =  $(man_DATMAN)
 EXTRA_PROGRAMS         =  $(src_EXTRA_PROGS)
 EXTRA_DIST             =  $(sysv_XTRAS) $(sysv_CFG) \
                            $(doc_DAT) $(man_DATMAN) \
-                          $(scripts_XTRAS) \
+                          $(scripts_XTRAS) $(src_XTRAS) \
                           pathconfig.h.pathsubst \
                           util-vserver.spec \
-                           m4/ensc_cflags.m4 m4/ensc_fpicsyscall.m4 \
-                          m4/ensc_cxxcompiler.m4 \
                           THANKS
 
+check_PROGRAMS         =  $(src_check_PRGS)
+check_SCRIPTS          =  $(src_check_SCRPTS)
+TESTS                  =  $(src_TSTS)
+
+TESTS_ENVIRONMENT      =  $(src_TESTS_ENV)
+
 AM_CPPFLAGS            =  -I $(top_srcdir)/lib -D _GNU_SOURCE $(RELEASE_CPPFLAGS)
 
 CLEANFILES             =  $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \
@@ -77,18 +82,29 @@ DIET_FLAGS          =
 DIET_CC                       :=  $(DIET) $(DIET_FLAGS) $(CC)
 endif
 
-linuxcaps.h:
-                       ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h
+linuxcaps.h:           ${kernelincludedir}/linux/capability.h Makefile
+                       @rm -f $@
+                       echo '#include <stdint.h>' >$@.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 $@
+
 
 linuxvirtual.h:
+if ENSC_ENABLE_INTERNAL_HEADERS
+                       ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
+else
                        ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \
                        ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
+endif
 
 pathsubst_RULES                =  s!@'PKGLIBDIR'@!$(pkglibdir)!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; \
@@ -125,10 +141,14 @@ pathconfig.h:             .pathconfig.h.pathsubst.stamp
                        @touch '$@'
 
 pkgstatedir            =  $(localstatedir)/run/vservers
+pkgstaterevdir         =  $(pkgstatedir).rev
 vserverpkgdir          =  $(vserverdir)/.pkg
 
 install-data-hook:
-                       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir)/rev
+                       $(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"
 
 install-vserverdir:
                        $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir)