Changeset 496


Ignore:
Timestamp:
Nov 16, 2011, 12:52:32 PM (10 years ago)
Author:
dmik
Message:

Fix makefiles to support kBuild from RPM.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r493 r496  
    4242# poppler
    4343#
    44 LIB_POPPLER_LIBS        =  $(patsubst %,$(PATH_LIB)/%$(SUFF_LIB), \
     44LIB_POPPLER_LIBS        =  $(patsubst %,$(PATH_STAGE_LIB)/%$(SUFF_LIB), \
    4545        fofi goo poppler splash fontconfig freetype2 jpeg)
    4646
  • trunk/LocalEnv.cmd.tpl

    r468 r496  
    1515
    1616/**
    17  * Path to kBuild.
     17 * Path to kBuild. Leave it empty if you already have kBuild in path.
    1818 */
    19 G.PATH_TOOL_KBUILD      = 'D:\Coding\libc\kBuild'
     19G.PATH_TOOL_KBUILD      = ''
    2020
    2121/**
  • trunk/Lucide/Makefile.kmk

    r413 r496  
    1919# Lucide documentation
    2020#
    21 Lucide_doc_INST          = $(notdir $(PATH_BIN))
     21Lucide_doc_INST          = $(INST_BIN)
    2222Lucide_doc_SOURCES      := \
    2323        changelog readme $(wildcard $(PATH_SUB_CURRENT)/readme_*.txt) \
  • trunk/Lucide/gui/Makefile.kmk

    r493 r496  
    5454        lcdfdlg.cpp                                                               \
    5555        Lucide.rc
    56 Lucide_dll_LIBPATH       = $(PATH_LIB)
     56Lucide_dll_LIBPATH       = $(PATH_STAGE_LIB)
    5757Lucide_dll_LIBS          = \
    5858        ludoc.lib
     
    7272# Lucide language files
    7373#
    74 Lucide_lng_INST          = $(notdir $(PATH_BIN))
     74Lucide_lng_INST          = $(INST_BIN)
    7575Lucide_lng_SOURCES      := $(wildcard $(PATH_SUB_CURRENT)/../lng/*.lng)
    7676
  • trunk/Lucide/plugins/ludjvu/Makefile.kmk

    r493 r496  
    2424        ludjvu.cpp
    2525ludjvu_LIBS              = \
    26         $(PATH_LIB)/ludoc$(SUFF_LIB) \
    27         $(PATH_LIB)/djvu$(SUFF_LIB)
     26        $(PATH_STAGE_LIB)/ludoc$(SUFF_LIB) \
     27        $(PATH_STAGE_LIB)/djvu$(SUFF_LIB)
    2828
    2929include $(FILE_KBUILD_SUB_FOOTER)
  • trunk/Lucide/plugins/lujpeg/Makefile.kmk

    r493 r496  
    2525        lujpeg.cpp
    2626lujpeg_LIBS              = \
    27         $(PATH_LIB)/ludoc$(SUFF_LIB) \
    28         $(PATH_LIB)/jpeg$(SUFF_LIB)
     27        $(PATH_STAGE_LIB)/ludoc$(SUFF_LIB) \
     28        $(PATH_STAGE_LIB)/jpeg$(SUFF_LIB)
    2929
    3030include $(FILE_KBUILD_SUB_FOOTER)
  • trunk/Lucide/plugins/lupoppler/Makefile.kmk

    r493 r496  
    3434        lupichoice.cpp
    3535lupoppler_LIBS           = \
    36         $(PATH_LIB)/ludoc$(SUFF_LIB) \
     36        $(PATH_STAGE_LIB)/ludoc$(SUFF_LIB) \
    3737        $(LIB_POPPLER_LIBS)
    3838
  • trunk/env.cmd

    r468 r496  
    4141
    4242/* setup kBuild */
    43 cmdline = 'call' G.PATH_TOOL_KBUILD'\envos2.cmd'
    44 cmdline
    45 drop cmdline
     43if (symbol('G.PATH_TOOL_KBUILD') \== 'LIT' & G.PATH_TOOL_KBUILD \== '') then do
     44    cmdline = 'call' G.PATH_TOOL_KBUILD'\envos2.cmd'
     45    cmdline
     46    drop cmdline
     47end
    4648
    4749/* setup GCC */
    48 if (G.PATH_TOOL_GCC4_ENV \== '') then do
    49 cmdline = 'call' G.PATH_TOOL_GCC4_ENV
    50 cmdline
    51 drop cmdline
     50if (symbol('G.PATH_TOOL_GCC4_ENV') \== 'LIT' & G.PATH_TOOL_GCC4_ENV \== '') then do
     51    cmdline = 'call' G.PATH_TOOL_GCC4_ENV
     52    cmdline
     53    drop cmdline
    5254end
    5355
Note: See TracChangeset for help on using the changeset viewer.