X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fkbd;h=bb9d261a7d5cbbcf16051107a7e8bfb71adb5885;hb=120d77b33cc106a67bfb7e88aee5ae115be18c97;hp=1c9924279826e38c26702ad116da225d09b8c34c;hpb=207c9813bc3e1ef121bb1bac89752c0a850dda6d;p=ipfire-2.x.git diff --git a/lfs/kbd b/lfs/kbd index 1c99242798..bb9d261a7d 100644 --- a/lfs/kbd +++ b/lfs/kbd @@ -35,13 +35,18 @@ TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch +objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch \ + kbd-latarcyrheb-16-fixed.tar.bz2 kbd-latsun-fonts.tar.bz2 $(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(THISAPP)-more-programs-1.patch = $(DL_FROM)/kbd-$(VER)-more-programs-1.patch +kbd-latarcyrheb-16-fixed.tar.bz2 = $(DL_FROM)/kbd-latarcyrheb-16-fixed.tar.bz2 +kbd-latsun-fonts.tar.bz2 = $(DL_FROM)/kbd-latsun-fonts.tar.bz2 $(DL_FILE)_MD5 = 069d1175b4891343b107a8ac2b4a39f6 $(THISAPP)-more-programs-1.patch_MD5 = dc70180a6bc0afa2b741cd38e3cc2e18 +kbd-latarcyrheb-16-fixed.tar.bz2_MD5 = 884fdbb0b952b2e3e8389a0c40a3e301 +kbd-latsun-fonts.tar.bz2_MD5 = e22ee88353968df8d4a4b1bf1fa8fc31 install : $(TARGET) @@ -74,6 +79,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-more-programs-1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-backspace-1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-1.patch + + # Extract our own fonts + cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latarcyrheb-16-fixed.tar.bz2 + cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latsun-fonts.tar.bz2 + cd $(DIR_APP) && ./configure --datadir=/lib/kbd --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install