diff options
| author | Andras Timar <atimar@suse.com> | 2011-10-30 22:55:29 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-10-30 22:55:29 +0100 |
| commit | 9ab6ecf33192750cc0353aa806e8ca2479f09224 (patch) | |
| tree | 618be906491ca64ec35c676c3df5ba43afd2ad12 /mysqlc | |
| parent | 726fe9cc4e89f1c4bcd74c64bcfc5b7785b6e642 (diff) | |
fix en-US only build
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/source/makefile.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index faec1024cfc7..9405defd4bb6 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -214,11 +214,7 @@ COMPONENT_IMAGES= \ # ........ component description ........ # one file for each WITH_LANG token -DESC_LANGS=$(WITH_LANG) -.IF "$(DESC_LANGS)" == "" - DESC_LANGS=en-US -.ENDIF -COMPONENT_DESCRIPTIONS=$/$(foreach,lang,$(DESC_LANGS) description-$(lang).txt) +COMPONENT_DESCRIPTIONS=$/$(foreach,lang,$(alllangiso) description-$(lang).txt) COMPONENT_DESCRIPTIONS_PACKDEP= \ $(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 @$(COPY) $< $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu > $(NULLDEV) +$(COMPONENT_DESCRIPTIONS_PACKDEP) : $(DESCRIPTION) + $(DESCRIPTION_SRC): description.xml +-$(RM) $@ +.IF "$(WITH_LANG)" != "" $(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $@ > $@.new mv $@.new $@ @$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR) +.ELSE + $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $< > $@ +.ENDIF @$(COPY) description-en-US.txt $(EXTENSIONDIR) .IF "$(SYSTEM_MYSQL)" != "YES" |