X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=b20814a94055c9365626492ee4a8cfcae6544f98;hb=28d1ab8272cf0688dd1090e66987ff7d5b369522;hp=526fc471a901b7b8685c937f81b2c888e25c6df0;hpb=ced1cdbd2950d8b7ffb82f8ebc4ebdbddac11dce;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 526fc47..b20814a 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -27,7 +27,7 @@ sysvdir = $(sysconfdir)/init.d confdir = $(sysconfdir)/vservers include_HEADERS = $(lib_HDRS) -noinst_HEADERS = $(src_HDRS) +noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h lib_LIBRARIES = $(lib_lib_LIBS) @@ -42,7 +42,7 @@ noinst_PROGRAMS = $(test_PRGS) sysv_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) -BUILT_SOURCES = linuxcaps.h pathconfig.h +BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h man_MANS = $(man_DATMAN) @@ -57,7 +57,7 @@ EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE AM_CFLAGS = -Wall -pedantic -CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) \ +CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) $(BUILT_SOURCES) \ .*.pathsubst.stamp */.*.pathsubst.stamp \ linuxcaps.h pathconfig.h @@ -70,6 +70,10 @@ endif linuxcaps.h: ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h +linuxvirtual.h: + ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \ + ln -sf '$(top_srcdir)/lib/virtual.h' '$@' + pathconfig.h: .pathconfig.h.pathsubst.stamp .%.pathsubst.stamp: %.pathsubst Makefile @mkdir -p $$(dirname '$@') @@ -84,6 +88,13 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp 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!@'NICE'@!$(NICE)!g; \ + s!@'VCONFIG'@!$(VCONFIG)!g; \ + s!@'WC'@!$(WC)!g; \ ' '$<' >'$@.tmp' @if cmp -s '$@.tmp' '$*'; then \ echo "... no changes, reusing old version"; \ @@ -94,6 +105,9 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @chmod a-w '$*' @touch '$@' +install-data-local: + $(INSTALL) -d -m755 $(DESTDIR)$(localstatedir)/run/vservers + include $(top_srcdir)/lib/Makefile-files include $(top_srcdir)/src/Makefile-files @@ -106,3 +120,4 @@ include $(top_srcdir)/sysv/Makefile-files include $(top_srcdir)/m4/gpgsig.am include $(top_srcdir)/m4/validate.am include $(top_srcdir)/m4/changelog.am +include $(top_srcdir)/m4/pkgconfig.am