Add pango, cairo and pixman.

[ipfire-2.x.git] / lfs / Config

diff --git a/lfs/Config b/lfs/Config
index b91f2ee63d06705c06d2c1fe13e4a243f93f007a..7360ac675ecee54f2784cfc72578cef194477c60 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -82,16 +82,8 @@ define PREBUILD
        # Fix installation on partial rebuild, so modules install where they should
        # and not everytime on the last compiled kernel
        if [ -f $(DIR_SRC)/linux-$(KVER) ]; then \
-               if [ "$(PAE)" = "1" ]; then \
-                       cd $(DIR_SRC)/linux-$(KVER) && \
-                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-pae+' Makefile; \
-               elif [ "$(XEN)" = "" ]; then \
-                       cd $(DIR_SRC)/linux-$(KVER) && \
-                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire+' Makefile; \
-               else \
-                       cd $(DIR_SRC)/linux-$(KVER) && \
-                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-xen+' Makefile; \
-               fi; \
+               cd $(DIR_SRC)/linux-$(KVER) && \
+                       sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire$(KCFG)+' Makefile; \
        fi
 endef
 else
@@ -104,6 +96,8 @@ endif
 #
 ifeq "$(ROOT)" ""
 define POSTBUILD
+       @echo "Updating linker cache..."
+       @type -p ldconfig >/dev/null && ldconfig || :
        @echo "Install done; saving file list to $(TARGET) ..."
        @$(FIND_FILES) > $(DIR_SRC)/lsalrnew
        @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff
@@ -119,10 +113,7 @@ define POSTBUILD
        # $(TARGET)_rootfile : ROOTFILE with KVER replacement
        # $(TARGET) : log result with {commented|include|added} files
        if [ -s "$(TARGET)_diff" ]; then \
-               if [ "$(PAE)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-pae; \
-               elif [ "$(XEN)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-xen; \
-               else LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
-               fi; \
+               LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))$(KCFG); \
                echo $(LFS_SCRIPT); \
                ROOTFILE=$$(find $(DIR_SRC)/config/rootfiles/{common,packages}/{$(MACHINE),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
                if [ "$$ROOTFILE" = "" ]; then \