merge with 0.30.213

[util-vserver.git] / distrib / Makefile.am

diff --git a/distrib/Makefile.am b/distrib/Makefile.am
index 2368029..852d2e0 100644 (file)
--- a/distrib/Makefile.am
+++ b/distrib/Makefile.am
@@ -21,16 +21,22 @@ distribdir =                $(pkglibdir)/distributions
 confdistribdir =       $(confdir)/.distributions
 confdefaultsdir =      $(confdir)/.defaults
 
-defaults_DATA =                misc/debootstrap.uri \
+defaults_DATA =                misc/debootstrap.mirror \
+                       misc/debootstrap.uri \
                        misc/fstab \
                        misc/mtab \
                        misc/vprocunhide-files \
                        misc/vunify-exclude \
+                       misc/environment \
+                       misc/context.start \
                        sample.conf
 
 nobase_distrib_SCRIPTS =  redhat/initpost \
                           redhat/initpre \
-                          redhat/rc.sysinit
+                          redhat/rc.sysinit \
+                          gentoo/initpost \
+                          gentoo/initpre \
+                          etch/initpost
 
 nobase_distrib_DATA    =  defaults/devs \
                           defaults/apt.conf \
@@ -41,19 +47,34 @@ nobase_distrib_DATA =  defaults/devs \
                           fc1/apt/rpmpriorities    fc1/pkgs/01    fc1/pkgs/02 \
                           fc2/apt/rpmpriorities    fc2/pkgs/01    fc2/pkgs/02 \
                           fc3/apt/rpmpriorities    fc3/pkgs/01    fc3/pkgs/02    fc3/pkgs/03 \
-                          fc3/yum/yum.conf $(wildcard fc3/yum.repos.d/fedora*.repo) \
+                          fc3/yum/yum.conf $(wildcard fc3/yum.repos.d/*.repo) \
                           $(wildcard fc3/rpmlist.d/*.lst) $(wildcard fc3/rpmlist.d/*.opt) \
                           fc4/apt/rpmpriorities    fc4/pkgs/01    fc4/pkgs/02    fc4/pkgs/03 \
-                          fc4/yum/yum.conf $(wildcard fc4/yum.repos.d/fedora*.repo) \
+                          fc4/yum/yum.conf $(wildcard fc4/yum.repos.d/*.repo) \
                           $(wildcard fc4/rpmlist.d/*.lst) $(wildcard fc4/rpmlist.d/*.opt) \
+                          fc5/apt/rpmpriorities    fc5/pkgs/01    fc5/pkgs/02    fc5/pkgs/03 \
+                          fc5/yum/yum.conf $(wildcard fc5/yum.repos.d/*.repo) \
+                          $(wildcard fc5/rpmlist.d/*.lst) $(wildcard fc5/rpmlist.d/*.opt) \
+                          fc6/apt/rpmpriorities    fc6/pkgs/01    fc6/pkgs/02    fc6/pkgs/03 \
+                          fc6/yum/yum.conf $(wildcard fc6/yum.repos.d/*.repo) \
+                          $(wildcard fc6/rpmlist.d/*.lst) $(wildcard fc6/rpmlist.d/*.opt) \
+                          centos4/pkgs/01 centos4/pkgs/02 centos4/pkgs/03 \
+                          centos4/yum/yum.conf $(wildcard centos4/yum.repos.d/*.repo) \
+                          centos5/pkgs/01 centos5/pkgs/02 centos5/pkgs/03 \
+                          centos5/yum/yum.conf $(wildcard centos5/yum.repos.d/*.repo) \
                           suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \
-                          suse91/rpm/macros
+                          suse91/rpm/macros \
+                          gentoo/init-vserver.sh gentoo/net.vserver \
+                          gentoo/reboot.sh gentoo/shutdown.sh \
+                          etch/vserver-config.sh
 
 nobase_confdistrib_DATA        =  rh9/apt/sources.list \
                           fc1/apt/sources.list \
                           fc2/apt/sources.list \
                           fc3/apt/sources.list \
                           fc4/apt/sources.list \
+                          fc5/apt/sources.list \
+                          fc6/apt/sources.list \
                           suse91/apt/sources.list
 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
@@ -64,7 +85,7 @@ EXTRA_DIST            =  $(nobase_distrib_DATA) \
                           $(nobase_confdistrib_DATA) \
                           $(defaults_DATA)
 
-redhat_style           =  rh9 fc1 fc2 fc3 fc4
+redhat_style           =  rh9 fc1 fc2 fc3 fc4 fc5 fc6 centos4 centos5
 
 install-exec-hook:     install-notify-xtra
 install-data-hook:     install-data-xtras