Zwischencommit fuer LFS. Groff und IPRoute2.

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

diff --git a/lfs/groff b/lfs/groff
index d2df3929e9463776a0474490a8ec34b0835c58b5..911096e7733d9958baf529f867aadd7cd4253f4e 100644 (file)
--- a/lfs/groff
+++ b/lfs/groff
@@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && sed -i -e 's/2010/002D/' -e 's/2212/002D/' \
                                -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto
        cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr --enable-multibyte --disable-nls
-       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        ln -sv eqn /usr/bin/geqn
        ln -sv tbl /usr/bin/gtbl

diff --git a/lfs/iproute2 b/lfs/iproute2
index 7f926bfa225cede45d834cc77abf169c9d20e1f4..fd5f7809a1304fb820f9bc6dcb7533819b02aa1f 100644 (file)
--- a/lfs/iproute2
+++ b/lfs/iproute2
@@ -31,7 +31,7 @@ VER        = 2.6.16-060323
 THISAPP    = iproute2-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/iproute2
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
@@ -73,8 +73,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && tar xfz $(DIR_DL)/htb3.6-020525.tgz *.diff
-       cd $(DIR_APP) && for i in htb3*tc.diff ; do patch -Np1 < $$i; done
+#      cd $(DIR_APP) && tar xfz $(DIR_DL)/htb3.6-020525.tgz *.diff
+#      cd $(DIR_APP) && for i in htb3*tc.diff ; do patch -Np1 < $$i; done
        cd $(DIR_APP) && make $(MAKETUNING) SBINDIR=/sbin
        cd $(DIR_APP) && make SBINDIR=/sbin install
        cd $(DIR_APP) && mv -v /sbin/arpd /usr/sbin