mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix en-US only build

Browse Source
This commit is contained in:
Andras Timar
2011-10-30 22:55:29 +01:00
parent 726fe9cc4e
commit 9ab6ecf331
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysqlc/source/makefile.mk
View File

@@ -214,11 +214,7 @@ COMPONENT_IMAGES= \
# ........ component description ........ # ........ component description ........
# one file for each WITH_LANG token # one file for each WITH_LANG token
DESC_LANGS=$(WITH_LANG) COMPONENT_DESCRIPTIONS=$/$(foreach,lang,$(alllangiso) description-$(lang).txt)
.IF "$(DESC_LANGS)" == ""
DESC_LANGS=en-US
.ENDIF
COMPONENT_DESCRIPTIONS=$/$(foreach,lang,$(DESC_LANGS) description-$(lang).txt)
COMPONENT_DESCRIPTIONS_PACKDEP= \ COMPONENT_DESCRIPTIONS_PACKDEP= \
$(foreach,i,$(COMPONENT_DESCRIPTIONS) $(EXTENSIONDIR)$/$i) $(foreach,i,$(COMPONENT_DESCRIPTIONS) $(EXTENSIONDIR)$/$i)
@@ -249,12 +245,18 @@ $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xc
@@-$(MKDIRHIER) $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess @@-$(MKDIRHIER) $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess
@$(COPY) $< $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu > $(NULLDEV) @$(COPY) $< $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu > $(NULLDEV)
$(COMPONENT_DESCRIPTIONS_PACKDEP) : $(DESCRIPTION)
$(DESCRIPTION_SRC): description.xml $(DESCRIPTION_SRC): description.xml
+-$(RM) $@ +-$(RM) $@
.IF "$(WITH_LANG)" != ""
$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all $(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all
$(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $@ > $@.new $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $@ > $@.new
mv $@.new $@ mv $@.new $@
@$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR) @$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR)
.ELSE
$(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $< > $@
.ENDIF
@$(COPY) description-en-US.txt $(EXTENSIONDIR) @$(COPY) description-en-US.txt $(EXTENSIONDIR)
.IF "$(SYSTEM_MYSQL)" != "YES" .IF "$(SYSTEM_MYSQL)" != "YES"