Install-Initrd finalisiert..

[people/pmueller/ipfire-2.x.git] / lfs / newt

diff --git a/lfs/newt b/lfs/newt
index 0921ac35fbbc4ad44bf20263fdf1a62d3bfe6b0d..598e9896eb98e475e0065361c8f8923d4ca967d1 100644 (file)
--- 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
@@ -91,16 +85,17 @@ 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
-       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