X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fdistrib%2FMakefile.am;h=3b70e2ba200ae2d31d96ce603a174d83d7a489f8;hb=3eb1b2279739d0f16391a3724a9897c686f030d3;hp=c9843b33f58f7f0824d0e615afd13aa3aa00b92b;hpb=3fcbb50e066c962a9f4297e091e23c30f44d6b29;p=util-vserver.git diff --git a/util-vserver/distrib/Makefile.am b/util-vserver/distrib/Makefile.am index c9843b3..3b70e2b 100644 --- a/util-vserver/distrib/Makefile.am +++ b/util-vserver/distrib/Makefile.am @@ -15,12 +15,11 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -confdir = $(sysconfdir)/vservers -defaultsdir = $(pkglibdir)/defaults -distribdir = $(pkglibdir)/distributions -confdistribdir = $(confdir)/.distributions -confdefaultsdir = $(confdir)/.defaults -confdefaultsinitdir = $(confdefaultsdir)/init +confdir = $(sysconfdir)/vservers +defaultsdir = $(pkglibdir)/defaults +distribdir = $(pkglibdir)/distributions +confdistribdir = $(confdir)/.distributions +confdefaultsdir = $(confdir)/.defaults defaults_DATA = misc/debootstrap.uri \ misc/fstab \ @@ -29,17 +28,28 @@ defaults_DATA = misc/debootstrap.uri \ misc/vunify-exclude nobase_distrib_SCRIPTS = redhat/initpost \ - redhat/initpre + redhat/initpre \ + redhat/rc.sysinit nobase_distrib_DATA = defaults/devs \ defaults/apt.conf \ defaults/rpm/macros \ defaults/apt/apt.conf \ - rh9/apt/rpmpriorities rh9/pkgs/01 rh9/pkgs/02 \ - fc1/apt/rpmpriorities fc1/pkgs/01 fc1/pkgs/02 + template/initpost template/initpre \ + rh9/apt/rpmpriorities rh9/pkgs/01 rh9/pkgs/02 \ + 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) \ + $(wildcard fc3/rpmlist.d/*.lst) $(wildcard fc3/rpmlist.d/*.opt) \ + suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ + suse91/rpm/macros nobase_confdistrib_DATA = rh9/apt/sources.list \ - fc1/apt/sources.list + fc1/apt/sources.list \ + fc2/apt/sources.list \ + fc3/apt/sources.list \ + suse91/apt/sources.list AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \ = $(nobase_distrib_SCRIPTS) @@ -49,7 +59,7 @@ EXTRA_DIST = $(nobase_distrib_DATA) \ $(nobase_confdistrib_DATA) \ $(defaults_DATA) -redhat_style = rh9 fc1 +redhat_style = rh9 fc1 fc2 install-data-hook: @@ -57,5 +67,8 @@ install-data-hook: ln -sf ../redhat/initpost $(DESTDIR)$(distribdir)/$$i/ && \ ln -sf ../redhat/initpre $(DESTDIR)$(distribdir)/$$i/; \ done - $(mkinstalldirs) $(DESTDIR)$(confdir) $(DESTDIR)$(confdefaultsdir) \ - $(DESTDIR)$(confdefaultsinitdir) + $(mkinstalldirs) $(DESTDIR)$(confdir) \ + $(DESTDIR)$(confdistribdir)/.common/pubkeys \ + $(DESTDIR)$(confdefaultsdir) \ + $(DESTDIR)$(confdefaultsdir)/apps/vunify/hash \ + $(DESTDIR)$(confdefaultsdir)/files