used $DEFAULT_VSERVERDIR and $DEFAULT_VSERVERPKGDIR instead of the
[util-vserver.git] / util-vserver / Makefile.am
index 77f5409..f4eb2e9 100644 (file)
@@ -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,6 +85,9 @@ pathsubst_RULES               =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                           s!@'SBINDIR'@!$(sbindir)!g; \
                           s!@'CONFDIR'@!$(confdir)!g; \
                           s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
+                          s!@'PKGSTATEDIR'@!$(pkgstatedir)!g; \
+                          s!@'VSERVERDIR'@!$(vserverdir)!g; \
+                          s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
                           s!@'PACKAGE'@!$(PACKAGE)!g; \
                           s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \
                           s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!g; \
@@ -113,10 +117,17 @@ pathconfig.h:             .pathconfig.h.pathsubst.stamp
                        @chmod a-w '$*'
                        @touch '$@'
 
-install-data-local:
-                       $(INSTALL) -d -m755 $(DESTDIR)$(localstatedir)/run/vservers
+pkgstatedir            =  $(localstatedir)/run/vservers
+vserverdir             =  /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)