Changeset 500


Ignore:
Timestamp:
Jan 10, 2012, 4:39:43 PM (9 years ago)
Author:
Silvan Scherrer
Message:

Lucide 1.3.4: adjust makefile to new kmk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.kmk

    r481 r500  
    1919
    2020PATH_OUT        ?= . # be on the safe side (we do rmdir -fR of PATH_PACKING)
    21 PATH_PACKING = $(PATH_OUT)/packing
     21PATH_PACKING = $(PATH_OUT)/dist/packing
    2222
    2323FILE_VERSION = $(subst $(SP),_,$(subst .,_,$(VERSION)$(if $(BUILD),_$(BUILD))))
     
    6363#
    6464
    65 Lucide_wpi_1_INST                = $(notdir $(PATH_PACKING))/wpi/1
     65Lucide_wpi_1_INST                = $(notdir $(PATH_PACKING))/wpi/1/
    6666Lucide_wpi_1_SOURCES     = \
    6767        $(TARGET_Lucide) \
     
    7171        $(abspathex $(Lucide_lng_SOURCES),$(Lucide_lng_PATH))
    7272
    73 Lucide_wpi_2_INST                = $(notdir $(PATH_PACKING))/wpi/2
     73Lucide_wpi_2_INST                = $(notdir $(PATH_PACKING))/wpi/2/
    7474Lucide_wpi_2_SOURCES     = $(TARGET_lupoppler)
    7575
    76 Lucide_wpi_3_INST                = $(notdir $(PATH_PACKING))/wpi/3
     76Lucide_wpi_3_INST                = $(notdir $(PATH_PACKING))/wpi/3/
    7777Lucide_wpi_3_SOURCES     = $(TARGET_ludjvu)
    7878
    79 Lucide_wpi_4_INST                = $(notdir $(PATH_PACKING))/wpi/4
     79Lucide_wpi_4_INST                = $(notdir $(PATH_PACKING))/wpi/4/
    8080Lucide_wpi_4_SOURCES     = $(TARGET_lujpeg)
    8181
    82 Lucide_wpi_5_INST                = $(notdir $(PATH_PACKING))/wpi/5
     82Lucide_wpi_5_INST                = $(notdir $(PATH_PACKING))/wpi/5/
    8383Lucide_wpi_5_SOURCES     = warpin/LngDummy.txt
    8484
    85 Lucide_wpi_6_INST                = $(notdir $(PATH_PACKING))/wpi/6
     85Lucide_wpi_6_INST                = $(notdir $(PATH_PACKING))/wpi/6/
    8686Lucide_wpi_6_SOURCES     = warpin/LngDummy.txt
    8787
    88 Lucide_wpi_7_INST                = $(notdir $(PATH_PACKING))/wpi/7
     88Lucide_wpi_7_INST                = $(notdir $(PATH_PACKING))/wpi/7/
    8989Lucide_wpi_7_SOURCES     = warpin/LngDummy.txt
    9090
    91 Lucide_wpi_8_INST                = $(notdir $(PATH_PACKING))/wpi/8
     91Lucide_wpi_8_INST                = $(notdir $(PATH_PACKING))/wpi/8/
    9292Lucide_wpi_8_SOURCES     = warpin/LngDummy.txt
    9393
    94 Lucide_wpi_9_INST                = $(notdir $(PATH_PACKING))/wpi/9
     94Lucide_wpi_9_INST                = $(notdir $(PATH_PACKING))/wpi/9/
    9595Lucide_wpi_9_SOURCES     = warpin/LngDummy.txt
    9696
    97 Lucide_wpi_10_INST               = $(notdir $(PATH_PACKING))/wpi/10
     97Lucide_wpi_10_INST               = $(notdir $(PATH_PACKING))/wpi/10/
    9898Lucide_wpi_10_SOURCES    = warpin/LngDummy.txt
    9999
     
    102102        $(call MSG_L1,Packing $@)
    103103        -$(QUIET)$(RM) -f $@
    104         $(QUIET)echo > $(abspathex $(Lucide_wpi_1_INST),$(PATH_OUT))/lucide.fcf
    105         $(QUIET)wic -a $@ \
     104        echo $(Lucide_wpi_1_INST)
     105        echo > $(abspathex $(Lucide_wpi_1_INST),$(PATH_OUT)/dist)/lucide.fcf
     106        wic -a $@ \
    106107                $(foreach p,$(patsubst Lucide_wpi_%,%,$(filter Lucide_wpi_%,$(INSTALLS))),\
    107                         $(p) -c$(abspathex $(Lucide_wpi_$(p)_INST),$(PATH_OUT)) \*) \
     108                        $(p) -c$(abspathex $(Lucide_wpi_$(p)_INST),$(PATH_OUT)/dist) \*) \
    108109                -s $(LUCIDE_WIS)
    109110
     
    123124#
    124125
    125 Lucide_zip_INST          = $(notdir $(PATH_PACKING))/zip
     126Lucide_zip_INST          = $(notdir $(PATH_PACKING))/zip/
    126127Lucide_zip_SOURCES       = \
    127128        $(foreach p,$(patsubst Lucide_wpi_%,%,$(filter Lucide_wpi_%,$(INSTALLS))),\
Note: See TracChangeset for help on using the changeset viewer.