X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fnewt;h=ab9a4b99e2f9760693b4396799b929c7ca5f24be;hb=93afd047ad6bb75be688d0dcd6e14594f6067939;hp=0921ac35fbbc4ad44bf20263fdf1a62d3bfe6b0d;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/newt b/lfs/newt
index 0921ac35f..ab9a4b99e 100644
--- a/lfs/newt
+++ b/lfs/newt
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: newt,v 1.8.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 0.50.17
 
 THISAPP    = newt-utf8_$(VER)
 DL_FILE    = $(THISAPP).orig.tar.gz
-DL_FROM    = $(URL_DEBIAN)/n/newt-utf8
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/newt-0.50.17
 ifeq "$(LFS_PASS)" "install"
   TARGET     = $(DIR_INFO)/$(THISAPP)-install
@@ -51,7 +45,7 @@ endif
 objects = $(DL_FILE) $(THISAPP)-9.6.diff.gz
 
 $(DL_FILE)                 = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-9.6.diff.gz     = $(URL_DEBIAN)/n/newt-utf8/$(THISAPP)-9.6.diff.gz
+$(THISAPP)-9.6.diff.gz     = $(DL_FROM)/$(THISAPP)-9.6.diff.gz
 
 $(DL_FILE)_MD5             = 4079546c307475ef2508dd2e98ed505e
 $(THISAPP)-9.6.diff.gz_MD5 = 5f1522189bdb16622677ad8e52f93119
@@ -89,18 +83,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/newt-0.50.17-vaend.patch
 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) && sed -i 's%^CFLAGS.*$$%CFLAGS = -Os -fomit-frame-pointer -Wall -D_GNU_SOURCE -DUTF8 -I/opt/i586-uClibc/include%' Makefile
 	cd $(DIR_APP) && make libnewt.a
-	cd $(DIR_APP) && install -m 0644 libnewt.a /install/lib
-	cd $(DIR_APP) && install -m 0644 newt.h /install/include
+	-mkdir -p /opt/$(MACHINE)-uClibc/{include,lib}
+	cd $(DIR_APP) && install -m 0644 libnewt.a /opt/$(MACHINE)-uClibc/lib/libnewt.a
+	cd $(DIR_APP) && install -m 0644 newt.h /opt/$(MACHINE)-uClibc/include/newt.h
 else
 	cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS) -DUTF8" ./configure --without-gpm-support
 	cd $(DIR_APP) && sed -i \
-	    -e 's/^PYVER.*$$/PYVER = 2.3/' \
+	    -e 's/^PYVER.*$$/PYVER = 2.4/' \
 	    -e 's/^all:.*$$/all: _snackmodule.so/' Makefile
-	cd $(DIR_APP) && echo 'install-snack: _snackmodule.so'					>> Makefile
-	cd $(DIR_APP) && echo '	install -s -m 644 _snackmodule.so $$(instroot)/$$(pythonbindir)'>> Makefile
-	cd $(DIR_APP) && echo '	install -m 644 snack.py $$(instroot)/$$(pythonbindir)'		>> Makefile
+	cd $(DIR_APP) && echo 'install-snack: _snackmodule.so'							>> Makefile
+	cd $(DIR_APP) && echo '	install -s -m 644 _snackmodule.so $$(instroot)/$$(pythonbindir)'	>> Makefile
+	cd $(DIR_APP) && echo '	install -m 644 snack.py $$(instroot)/$$(pythonbindir)'			>> Makefile
 	cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS)" make install-snack
 	cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS)" make install-utf8sh
 	cd $(DIR_APP) && install -m 0644 newt.h /usr/include