From dc8b9670a96fac7729e3a1a0afddf3bbed17972e Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 18 Oct 2007 05:55:08 +0000 Subject: [PATCH] Buildfixes git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@976 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/grub | 2 +- config/rootfiles/packages/clamav | 2 +- config/rootfiles/packages/mpfire | 2 +- config/rootfiles/packages/samba | 2 +- lfs/backup | 2 +- make.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/common/grub b/config/rootfiles/common/grub index 3f3ff55971..2324e1cfb5 100644 --- a/config/rootfiles/common/grub +++ b/config/rootfiles/common/grub @@ -1,5 +1,5 @@ #boot/grub -boot/grub/default +#boot/grub/default boot/grub/grub.conf boot/grub/ipfire.xpm.gz boot/grub/stage1 diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index d59c27a82f..5b9673cef3 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -9,7 +9,7 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.2 -usr/lib/libclamav.so.2.0.7 +usr/lib/libclamav.so.2.0.8 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/config/rootfiles/packages/mpfire b/config/rootfiles/packages/mpfire index dc0ba428d3..7c6f01bf72 100644 --- a/config/rootfiles/packages/mpfire +++ b/config/rootfiles/packages/mpfire @@ -1,6 +1,6 @@ usr/local/bin/mpfirectrl srv/web/ipfire/cgi-bin/mpfire.cgi -var/ipfire/backup/addons/include/mpfire +var/ipfire/backup/addons/includes/mpfire var/ipfire/menu.d/EX-mpfire.menu var/ipfire/mpfire var/ipfire/mpfire/bin diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba index 35bc24b407..a50a8a5a1e 100644 --- a/config/rootfiles/packages/samba +++ b/config/rootfiles/packages/samba @@ -574,7 +574,7 @@ usr/sbin/winbindd #usr/share/samba/swat/using_samba/samba2_s.gif #usr/share/samba/swat/using_samba/samba2_xs.gif #usr/share/samba/swat/using_samba/toc.html -var/ipfire/backup/addons/include/samba +var/ipfire/backup/addons/includes/samba #var/ipfire/samba var/ipfire/samba/default.global var/ipfire/samba/default.pdc diff --git a/lfs/backup b/lfs/backup index d11e7ea2c2..d0038724c0 100644 --- a/lfs/backup +++ b/lfs/backup @@ -61,6 +61,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(DIR_SRC)/config/backup/exclude /var/ipfire/backup/ chown nobody:nobody -R /var/ipfire/backup/ -mkdir -p /var/ipfire/backup/addons - -mkdir -p /var/ipfire/backup/addons/include + -mkdir -p /var/ipfire/backup/addons/includes -mkdir -p /var/ipfire/backup/addons/backup @$(POSTBUILD) diff --git a/make.sh b/make.sh index c42cc821b1..dbaa1fc2b0 100755 --- a/make.sh +++ b/make.sh @@ -318,6 +318,7 @@ buildipfire() { LOGFILE="$BASEDIR/log/_build.ipfire.log" export LOGFILE ipfiremake configroot + ipfiremake backup ipfiremake dhcp ipfiremake dhcpcd ipfiremake libusb @@ -500,7 +501,6 @@ buildipfire() { ipfiremake libpri ipfiremake stund ipfiremake asterisk - ipfiremake backup ipfiremake gnump3d ipfiremake libsigc++ ipfiremake applejuice -- 2.39.2