- fixed some statements which would fail with 'set -e'
[util-vserver.git] / util-vserver / Makefile.am
index 77f5409..f265b53 100644 (file)
@@ -23,23 +23,26 @@ SUBDIRS                     =  . distrib
 CVS2CL_AMFLAGS         =  $(CVS2CL_TAG) -U cvsusers.map
 CVS2CL_ALLFLAGS        :=  $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS)
 
-sysvdir                        =  $(sysconfdir)/init.d
 confdir                        =  $(sysconfdir)/vservers
+sbincfgdir             =  $(sbindir)
 
 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)
+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)
 
-sysv_SCRIPTS           =  $(sysv_SCRPTS)
+initrd_SCRIPTS         =  $(sysv_SCRPTS)
 sysconf_DATA           =  $(sysv_CFG)
 
 DIETPROGS              =  $(src_DIETPROGS) $(tests_DIETPROGS)
@@ -48,18 +51,19 @@ 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) \
+                          $(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) \
+CLEANFILES             =  $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \
                           .*.pathsubst.stamp */.*.pathsubst.stamp \
                           linuxcaps.h pathconfig.h
 
@@ -84,7 +88,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; \
@@ -104,6 +114,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'; \
@@ -113,10 +124,18 @@ 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
+
+install-vserverdir:
+                       $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir)
 
 if USE_DIETLIBC
+$(DIETPROGS):          LIBTOOL=$(LIBTOOL) --tag CC
+
 $(addsuffix $(EXEEXT), $(DIETPROGS)) \
 $(addsuffix $(OBJEXT), $(DIETPROGS)) \
                :               CC=$(DIET_CC)