makde it compilable with gcc296
[util-vserver.git] / util-vserver / Makefile.am
index 17ff7bb..b1e093c 100644 (file)
@@ -29,7 +29,7 @@ sbincfgdir            =  $(sbindir)
 legacydir              =  $(pkglibdir)/legacy
 
 include_HEADERS                =  $(lib_HDRS)
-noinst_HEADERS         =  $(src_HDRS) $(lib_XHDRS) compat.h
+noinst_HEADERS         =  $(src_HDRS) $(lib_XHDRS) compat.h compat-c99.h
 
 lib_LIBRARIES          =  $(lib_lib_LIBS)
 lib_LTLIBRARIES                =  $(lib_lib_LTLIBS) $(src_lib_LTLIBS)
@@ -42,7 +42,7 @@ legacy_SCRIPTS                =  $(scripts_legacy_SCRPTS)
 
 sbincfg_DATA           =  $(scripts_sbincfg_DTA)
 
-sbin_SCRIPTS           =  $(scripts_sbin_PRGS)
+sbin_SCRIPTS           =  $(scripts_sbin_PRGS) $(src_sbin_SCRPTS)
 sbin_PROGRAMS          =  $(src_sbin_PRGS)
 noinst_PROGRAMS                =  $(test_PRGS)
 
@@ -72,7 +72,7 @@ TESTS_ENVIRONMENT     =  $(src_TESTS_ENV)
 AM_CPPFLAGS            =  -I $(top_srcdir)/lib -D _GNU_SOURCE $(RELEASE_CPPFLAGS)
 
 CLEANFILES             =  $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \
-                          .*.pathsubst.stamp */.*.pathsubst.stamp \
+                          .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \
                           linuxcaps.h pathconfig.h
 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT     =  $(src_OPTIONS_EXEMPT) \
@@ -107,6 +107,7 @@ else
 endif
 
 pathsubst_RULES                =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
+                          s!@'LEGACYDIR'@!$(legacydir)!g; \
                           s!@'SBINDIR'@!$(sbindir)!g; \
                           s!@'CONFDIR'@!$(confdir)!g; \
                           s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
@@ -130,6 +131,7 @@ pathsubst_RULES             =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                           s!@'UMOUNT'@!$(UMOUNT)!g; \
                           s!@'NICE'@!$(NICE)!g; \
                           s!@'VCONFIG'@!$(VCONFIG)!g; \
+                          s!@'PS'@!$(PS)!g; \
                           s!@'WC'@!$(WC)!g
 
 pathconfig.h:          .pathconfig.h.pathsubst.stamp