From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Fri, 3 Nov 2006 23:15:47 +0000 (+0000)
Subject: Mailx und Newt Fixes.
X-Git-Tag: v2.3-beta1~915
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c81f72a1b5974a01bf2354456a9d63bcf8ac8fbc

Mailx und Newt Fixes.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@339 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 4c7252ba7b..5b33f23a5b 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.1b ==
+== List of softwares used to build IPFire Version: 2.0b ==
 * 3c5x9setup-1.00
 * Archive-Tar-1.29
 * Archive-Zip-1.16
@@ -46,7 +46,7 @@
 * ccache-2.4
 * cdrtools-2.01
 * cftp-0.12
-* clamav-0.88.4
+* clamav-0.88.5
 * coreutils-5.96
 * cups-1.2.2
 * cyrus-imapd-2.2.12
diff --git a/lfs/mailx b/lfs/mailx
index 6660b70fba..ebc3565f81 100644
--- a/lfs/mailx
+++ b/lfs/mailx
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mailx
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make $(MAKETUNING) SENDMAIL=/usr/sbin/sendmail
+	cd $(DIR_APP) && make SENDMAIL=/usr/sbin/sendmail
 	cd $(DIR_APP) && make PREFIX=/usr UCBINSTALL=/usr/bin/install install
 	cd $(DIR_APP) && ln -v -sf mailx /usr/bin/mail
 	cd $(DIR_APP) && ln -v -sf mailx /usr/bin/nail
diff --git a/lfs/newt b/lfs/newt
index fa6e6a1a6a..659a1bad7d 100644
--- a/lfs/newt
+++ b/lfs/newt
@@ -85,8 +85,8 @@ ifeq "$(LFS_PASS)" "install"
 	cd $(DIR_APP) && ./configure --without-gpm-support --host $(MACHINE)-uclibc
 	cd $(DIR_APP) && sed -i 's%^CFLAGS.*$$%CFLAGS = -Os -fomit-frame-pointer -Wall -D_GNU_SOURCE -DUTF8 -I/install/include/slang%' Makefile
 	cd $(DIR_APP) && make libnewt.a
+	-mkdir -p /install/$(MACHINE)-uClibc/{include,lib}
 	cd $(DIR_APP) && install -m 0644 libnewt.a /install/$(MACHINE)-uClibc/lib
-	-mkdir -p /install/$(MACHINE)-uClibc/include
 	cd $(DIR_APP) && install -m 0644 newt.h /install/$(MACHINE)-uClibc/include/newt.h
 else
 	cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS) -DUTF8" ./configure --without-gpm-support