use new ensc_wrappers/ headers
[util-vserver.git] / util-vserver / Makefile.am
index 52dd450..2bc5085 100644 (file)
@@ -29,8 +29,12 @@ sbincfgdir           =  $(sbindir)
 legacydir              =  $(pkglibdir)/legacy
 
 include_HEADERS                =  $(lib_HDRS)
-noinst_HEADERS         =  $(src_HDRS) $(lib_XHDRS) compat.h compat-c99.h
+noinst_HEADERS         =  $(src_HDRS) $(lib_XHDRS) \
+                          $(ENSC_VECTOR_HDRS) $(ENSC_VECTOR_XHDRS) \
+                          $(ENSC_WRAPPERS_HDRS) \
+                          compat.h compat-c99.h
 
+noinst_LIBRARIES       =  $(src_lib_LIBS) $(ENSC_VECTOR_LIBS)
 lib_LIBRARIES          =  $(lib_lib_LIBS)
 lib_LTLIBRARIES                =  $(lib_lib_LTLIBS) $(src_lib_LTLIBS)
 pkglib_LTLIBRARIES     =  $(src_pkglib_LTLIBS)
@@ -45,16 +49,17 @@ 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)
 
-DIETPROGS              =  $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS)
+DIETPROGS              =  $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) \
+                          $(ENSC_VECTOR_LIBS)
 
-BUILT_SOURCES          =  linuxcaps.h pathconfig.h linuxvirtual.h
+BUILT_SOURCES =                linuxcaps.h pathconfig.h linuxvirtual.h
 
-man_MANS               =  $(man_DATMAN)
+man_MANS =             $(man_DATMAN)
 
 EXTRA_PROGRAMS =       $(src_EXTRA_PROGS)
 EXTRA_DIST =           $(sysv_XTRAS) $(sysv_CFG) \
@@ -71,7 +76,7 @@ TESTS                 =  $(src_TSTS)
 
 TESTS_ENVIRONMENT      =  $(src_TESTS_ENV)
 
-AM_CPPFLAGS            =  -I $(top_srcdir)/lib -D _GNU_SOURCE $(RELEASE_CPPFLAGS)
+AM_CPPFLAGS            =  -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers -D _GNU_SOURCE $(RELEASE_CPPFLAGS)
 
 CLEANFILES =           $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \
                        $(contrib_CLEANFILES) \
@@ -95,7 +100,7 @@ endif
 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
+                       $(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 $@
@@ -123,6 +128,7 @@ pathsubst_RULES             =  s!@'PKGLIBDIR'@!$(pkglibdir)!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; \
@@ -136,13 +142,14 @@ pathsubst_RULES           =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                           s!@'NICE'@!$(NICE)!g; \
                           s!@'VCONFIG'@!$(VCONFIG)!g; \
                           s!@'PS'@!$(PS)!g; \
-                          s!@'WC'@!$(WC)!g
+                          s!@'WC'@!$(WC)!g; \
+                          s!@'WGET'@!$(WGET)!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 +164,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)
@@ -184,6 +206,8 @@ include $(top_srcdir)/scripts/Makefile-files
 include $(top_srcdir)/tests/Makefile-files
 include $(top_srcdir)/sysv/Makefile-files
 include $(top_srcdir)/contrib/Makefile-files
+include $(top_srcdir)/ensc_vector/Makefile-files
+include $(top_srcdir)/ensc_wrappers/Makefile-files
 
 include $(top_srcdir)/m4/gpgsig.am
 include $(top_srcdir)/m4/validate.am