diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 14:50:31 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 14:50:31 +0000 |
| commit | 6ac364938533dfba5978a01b48a89dae8efb14ab (patch) | |
| tree | ad8576cb4e303d551f7eb8852ce584ac42963524 /solenv/inc/tg_merge.mk | |
| parent | c6b293967be0134de11c3da96ad5b0dd46c50402 (diff) | |
INTEGRATION: CWS apoctemplate (1.9.6); FILE MERGED
2006/11/16 17:06:45 ihi 1.9.6.1: Resync fix
Diffstat (limited to 'solenv/inc/tg_merge.mk')
| -rw-r--r-- | solenv/inc/tg_merge.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk index de85abfb7cb4..c79ef75e5efd 100644 --- a/solenv/inc/tg_merge.mk +++ b/solenv/inc/tg_merge.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_merge.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: kz $ $Date: 2006-11-08 12:04:09 $ +# last change: $Author: kz $ $Date: 2006-12-12 15:50:31 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -47,6 +47,16 @@ $(foreach,i,$(ULFFILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf $(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf .ENDIF # "$(ULFFILES)"!="" +# *.xrm merge +.IF "$(READMEFILES)"!="" +$(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm) : $$(@:f) localize.sdf +.ENDIF # "$(ULFFILES)"!="" + +# *.xrm merge +.IF "$(APOCHELPFILES)"!="" +$(foreach,i,$(APOCHELPFILES) $(COMMONMISC)$/$(MYPATH)$/$(i:b).xrm) : $$(@:f) localize.sdf +.ENDIF # "$(ULFFILES)"!="" + # *.xcu merge .IF "$(LOCALIZEDFILES)"!="" $(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/merge$/{$(subst,.,$/ $(PACKAGE))}$/$(i:b).xcu) : $$(@:f) localize.sdf |