]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Removed slang from installation system.
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 Aug 2008 18:40:52 +0000 (20:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 Aug 2008 18:40:52 +0000 (20:40 +0200)
lfs/slang

index 2d7b996dbbf773bc082d4a3e7f7d85cf232ff68d..3a451feeb0fc99d518cbdf63e4327bc053442afb 100644 (file)
--- a/lfs/slang
+++ b/lfs/slang
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(THISAPP)-uclibc-1.patch
+objects = $(DL_FILE)
 
 install: $(TARGET)
 
@@ -53,28 +53,10 @@ $(objects) :
 $(TARGET) : 
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-
-ifeq "$(STAGE)" "ipfire"
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install_doc_dir=/usr/share/doc/slang-$(VER) \
                SLSH_DOC_DIR=/usr/share/doc/slang-$(VER)/slsh install-all
        chmod -v 755 /usr/lib/libslang.so.$(VER) /usr/lib/slang/v2/modules/*.so
-endif
-
-ifeq "$(STAGE)" "installer"
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-uclibc-1.patch
-       cd $(DIR_APP) && $(U_TOOLS) \
-               ./configure \
-                       --host=$(UCLIBC_TARGET) \
-                       --prefix=/usr \
-                       --sysconfdir=/etc \
-                       --with-png=no
-       cd $(DIR_APP)/src && make $(PARALLELISMFLAGS)
-       cd $(DIR_APP)/src && make DESTDIR=$(INSTALLER_DIR) install-all
-       -chmod -v 755 $(INSTALLER_DIR)/usr/lib/libslang.so.$(VER) \
-               $(INSTALLER_DIR)/usr/lib/slang/v2/modules/*.so
-endif
-
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)