From 5e5bad4d496f6429563ffa4fa8f4ad06c54badad Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Tue, 19 Sep 2006 15:20:56 +0000 Subject: [PATCH] Fix Makefiles and the manifest to include all the files needed. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2323 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- contrib/manifest.dat.pathsubst | 1 + distrib/Makefile.am | 7 ++++--- ensc_wrappers/Makefile-files | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/manifest.dat.pathsubst b/contrib/manifest.dat.pathsubst index 5cfd417..17f1e9f 100644 --- a/contrib/manifest.dat.pathsubst +++ b/contrib/manifest.dat.pathsubst @@ -14,6 +14,7 @@ build @PKGLIBDIR@/vserver-build.functions.rpm build @PKGLIBDIR@/vserver-build.functions.yum build @PKGLIBDIR@/vserver-build.functions.pkgmgmt build @PKGLIBDIR@/vserver-setup.functions +build @PKGLIBDIR@/magic.mime base @PKGLIBDIR@/vserver.functions base @PKGLIBDIR@/vserver.start @ENSC_HAVE_C99_COMPILER_TRUE@base @PKGLIBDIR@/vserver.start.bin diff --git a/distrib/Makefile.am b/distrib/Makefile.am index 42953af..635de90 100644 --- a/distrib/Makefile.am +++ b/distrib/Makefile.am @@ -50,8 +50,8 @@ nobase_distrib_DATA = defaults/devs \ 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) \ - centos42/pkgs/01 centos42/pkgs/02 centos42/pkgs/03 \ - centos42/yum/yum.conf $(wildcard centos42/yum.repos.d/*.repo) \ + centos4/pkgs/01 centos4/pkgs/02 centos4/pkgs/03 \ + centos4/yum/yum.conf $(wildcard centos4/yum.repos.d/*.repo) \ suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ suse91/rpm/macros @@ -60,6 +60,7 @@ nobase_confdistrib_DATA = rh9/apt/sources.list \ fc2/apt/sources.list \ fc3/apt/sources.list \ fc4/apt/sources.list \ + fc5/apt/sources.list \ suse91/apt/sources.list AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \ @@ -70,7 +71,7 @@ EXTRA_DIST = $(nobase_distrib_DATA) \ $(nobase_confdistrib_DATA) \ $(defaults_DATA) -redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 centos42 +redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 centos4 install-exec-hook: install-notify-xtra install-data-hook: install-data-xtras diff --git a/ensc_wrappers/Makefile-files b/ensc_wrappers/Makefile-files index 6783b27..650ef7b 100644 --- a/ensc_wrappers/Makefile-files +++ b/ensc_wrappers/Makefile-files @@ -28,6 +28,7 @@ noinst_HEADERS += ensc_wrappers/wrappers-clone.hc \ ensc_wrappers/wrappers-stat.hc \ ensc_wrappers/wrappers-stdlib.hc \ ensc_wrappers/wrappers-string.hc \ + ensc_wrappers/wrappers-termios.hc \ ensc_wrappers/wrappers-unistd.hc \ ensc_wrappers/wrappers-vserver.hc \ ensc_wrappers/wrappers-wait.hc \ -- 1.8.1.5