X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=7915f459da4c943a03f0e2606dae430a15f54577;hb=fb2144cff0e2e67d101329f45ecd7e3c2f760991;hp=f4eb2e968f7964daf1b9afa72994aad41a1be771;hpb=9e48164b94760dc5a9a4e40c2961398a99fdc190;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index f4eb2e9..7915f45 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -20,10 +20,11 @@ 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 +sbincfgdir = $(sbindir) include_HEADERS = $(lib_HDRS) noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h @@ -31,11 +32,13 @@ noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h lib_LIBRARIES = $(lib_lib_LIBS) #lib_LTLIBRARIES = $(lib_lib_LTLIBS) -pkglib_SCRIPTS = $(scripts_SCRPTS) -pkglib_DATA = $(scriptscfg_DATA) $(scripts_DTA) +pkglib_SCRIPTS = $(scripts_pkglib_SCRPTS) +pkglib_DATA = $(scripts_pkglib_DTA) pkglib_PROGRAMS = $(src_pkglib_PRGS) -sbin_SCRIPTS = $(scripts_PRGS) +sbincfg_DATA = $(scripts_sbincfg_DTA) + +sbin_SCRIPTS = $(scripts_sbin_PRGS) sbin_PROGRAMS = $(src_sbin_PRGS) noinst_PROGRAMS = $(test_PRGS) @@ -48,19 +51,21 @@ BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h man_MANS = $(man_DATMAN) +m4_FILES = m4/ensc_cflags.m4 m4/ensc_kerneldir.m4 \ + m4/ensc_changelog.m4 m4/ensc_uv_vrootdir.m4 \ + m4/ensc_fpicsyscall.m4 m4/ensc_cxxcompiler.m4 + EXTRA_PROGRAMS = $(src_EXTRA_PROGS) EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ $(doc_DAT) $(man_DATMAN) \ - $(scripts_SCRPTS) $(scripts_PRGS) $(scripts_XTRAS) \ + $(scripts_XTRAS) $(m4_FILES) \ pathconfig.h.pathsubst \ util-vserver.spec \ - m4/ensc_cflags.m4 m4/ensc_fpicsyscall.m4 \ - m4/ensc_cxxcompiler.m4 \ THANKS AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE $(RELEASE_CPPFLAGS) -CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) $(BUILT_SOURCES) \ +CLEANFILES = $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \ .*.pathsubst.stamp */.*.pathsubst.stamp \ linuxcaps.h pathconfig.h @@ -74,8 +79,14 @@ 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 ' >$@.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: ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \ @@ -88,7 +99,10 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'PKGSTATEDIR'@!$(pkgstatedir)!g; \ s!@'VSERVERDIR'@!$(vserverdir)!g; \ s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \ - s!@'PACKAGE'@!$(PACKAGE)!g; \ + s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \ + s!@'INITRDDIR'@!$(initrddir)!g; \ + s!@'LIBDIR'@!$(libdir)!g; \ + s!@'INCLUDEDIR'@!$(includedir)!g; \ s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \ s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!g; \ s!@'PACKAGE_STRING'@!$(PACKAGE_STRING)!g; \ @@ -108,6 +122,7 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @mkdir -p $$(dirname '$@') @echo "sed -e '...' $*.pathsubst >$*" @sed -e '$(pathsubst_RULES)' '$<' >'$@.tmp' + @-chmod --reference='$<' '$@.tmp' @if cmp -s '$@.tmp' '$*'; then \ echo "... no changes, reusing old version"; \ rm -f '$@.tmp'; \ @@ -118,11 +133,12 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @touch '$@' pkgstatedir = $(localstatedir)/run/vservers -vserverdir = /vservers vserverpkgdir = $(vserverdir)/.pkg install-data-hook: $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir)/rev + +install-vserverdir: $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir) if USE_DIETLIBC