X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=64ee9b792ab3d2ebaacce715192ba3a57c8cf403;hb=HEAD;hp=5f92a9a600105e335684bb62508c388fd393861c;hpb=0754ac0a3b5ac2cc77cbb0cb85c6f8888459d1f6;p=util-vserver.git diff --git a/Makefile.am b/Makefile.am index 5f92a9a..64ee9b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,9 +20,6 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = . distrib -SVN2CL_AMFLAGS = $(SVN2CL_TAG) --authors=svnusers.map -SVN2CL_ALLFLAGS := $(SVN2CL_AMFLAGS) $(SVN2CL_FLAGS) - confdir = $(sysconfdir)/vservers confdefaultsdir = $(confdir)/.defaults sbincfgdir = $(sbindir) @@ -52,6 +49,7 @@ initrd_SCRIPTS = sysconf_DATA = pyexec_LTLIBRARIES = +pyexec_SCRIPTS = DIETPROGS = $(LIBENSCVECTOR_DIET) @@ -60,7 +58,8 @@ BUILT_SOURCES = pathconfig.h \ man_MANS = -kernel_HDRS = $(wildcard kernel/*.h) +kernel_HDRS = \ + $(patsubst ${srcdir}/%,%,$(wildcard ${srcdir}/kernel/*.h)) EXTRA_PROGRAMS = @@ -142,6 +141,9 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!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; \ + s!@'HAVE_PYTHON_TRUE'@!\@HAVE_PYTHON_TRUE@ !g; \ + s!@'HAVE_PYTHON_FALSE'@!\@HAVE_PYTHON_FALSE@ !g; \ + s!@'PYEXECDIR'@!$(pyexecdir)!g; \ $(ENSC_PATHPROG_SED) pathconfig.h: .pathconfig.h.pathsubst.stamp @@ -149,7 +151,7 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @mkdir -p $$(dirname '$@') @echo "$(SED) -e '...' $*.pathsubst >$*" @$(SED) -e '$(pathsubst_RULES)' '$<' >'$@.tmp' - @-chmod --reference='$<' '$@.tmp' + @-chmod $$(stat -c '%a' '$<') '$@.tmp' @if cmp -s '$@.tmp' '$*'; then \ echo "... no changes, reusing old version"; \ rm -f '$@.tmp'; \ @@ -232,6 +234,7 @@ include $(top_srcdir)/gentoo/Makefile-files if HAVE_PYTHON include $(top_srcdir)/python/Makefile-files endif +include $(top_srcdir)/debian/Makefile-files include $(top_srcdir)/m4/gpgsig.am include $(top_srcdir)/m4/validate.am