Diverse Fixes.

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

diff --git a/lfs/newt b/lfs/newt
index 659a1bad7d1172661a2bb1e04e7a425f872cfaf6..ab9a4b99e2f9760693b4396799b929c7ca5f24be 100644 (file)
--- a/lfs/newt
+++ b/lfs/newt
@@ -45,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
@@ -83,11 +83,11 @@ $(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
-       -mkdir -p /install/$(MACHINE)-uClibc/{include,lib}
-       cd $(DIR_APP) && install -m 0644 libnewt.a /install/$(MACHINE)-uClibc/lib
-       cd $(DIR_APP) && install -m 0644 newt.h /install/$(MACHINE)-uClibc/include/newt.h
+       -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 \