X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=dbaf0b282bd99b929e65939d48296f38a9bfd64e;hb=e5099a4be56aed76b5b8e537ccffad6f79c0bd86;hp=77f5409e3a85d26298aee9c519f7a55f3c435de1;hpb=6f52352eaf100333c5554471eadbb0c7c860fc4a;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 77f5409..dbaf0b2 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -23,13 +23,13 @@ SUBDIRS = . distrib CVS2CL_AMFLAGS = $(CVS2CL_TAG) -U cvsusers.map CVS2CL_ALLFLAGS := $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS) -sysvdir = $(sysconfdir)/init.d confdir = $(sysconfdir)/vservers include_HEADERS = $(lib_HDRS) 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) @@ -39,7 +39,7 @@ sbin_SCRIPTS = $(scripts_PRGS) sbin_PROGRAMS = $(src_sbin_PRGS) noinst_PROGRAMS = $(test_PRGS) -sysv_SCRIPTS = $(sysv_SCRPTS) +initrd_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) @@ -48,16 +48,17 @@ BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h man_MANS = $(man_DATMAN) +EXTRA_PROGRAMS = $(src_EXTRA_PROGS) EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ $(doc_DAT) $(man_DATMAN) \ $(scripts_SCRPTS) $(scripts_PRGS) $(scripts_XTRAS) \ pathconfig.h.pathsubst \ util-vserver.spec \ - m4/ensc_cflags.m4 \ + m4/ensc_cflags.m4 m4/ensc_fpicsyscall.m4 \ + m4/ensc_cxxcompiler.m4 \ THANKS -AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE -AM_CFLAGS = -Wall -pedantic +AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE $(RELEASE_CPPFLAGS) CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) $(BUILT_SOURCES) \ .*.pathsubst.stamp */.*.pathsubst.stamp \ @@ -84,7 +85,13 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'SBINDIR'@!$(sbindir)!g; \ s!@'CONFDIR'@!$(confdir)!g; \ s!@'SYSCONFDIR'@!$(sysconfdir)!g; \ - s!@'PACKAGE'@!$(PACKAGE)!g; \ + s!@'PKGSTATEDIR'@!$(pkgstatedir)!g; \ + s!@'VSERVERDIR'@!$(vserverdir)!g; \ + s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!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; \ @@ -113,10 +120,16 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @chmod a-w '$*' @touch '$@' -install-data-local: - $(INSTALL) -d -m755 $(DESTDIR)$(localstatedir)/run/vservers +pkgstatedir = $(localstatedir)/run/vservers +vserverpkgdir = $(vserverdir)/.pkg + +install-data-hook: + $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir)/rev + $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir) if USE_DIETLIBC +$(DIETPROGS): LIBTOOL=$(LIBTOOL) --tag CC + $(addsuffix $(EXEEXT), $(DIETPROGS)) \ $(addsuffix $(OBJEXT), $(DIETPROGS)) \ : CC=$(DIET_CC)