diff options
author | marha <marha@users.sourceforge.net> | 2009-07-24 18:07:33 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-24 18:07:33 +0000 |
commit | a16c0d6f73877af35ea0519917a82d5919e3c304 (patch) | |
tree | b575998554afa00acc1086ff0a5ef17785c75326 /xorg-server/xkbdata.src/po/Makefile.in.in | |
parent | 0489d8cc5cc2f0bbdbee7aa2ed771ca0d42f30aa (diff) | |
parent | ea63f0fae5c393ccf198aad0ae4dbda6d2a4391a (diff) | |
download | vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.gz vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.bz2 vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/po/Makefile.in.in')
-rw-r--r-- | xorg-server/xkbdata.src/po/Makefile.in.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkbdata.src/po/Makefile.in.in b/xorg-server/xkbdata.src/po/Makefile.in.in index 57ef267b3..c7e83022c 100644 --- a/xorg-server/xkbdata.src/po/Makefile.in.in +++ b/xorg-server/xkbdata.src/po/Makefile.in.in @@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) |