summaryrefslogtreecommitdiff
path: root/extra/locale
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2011-01-03 14:37:49 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2011-01-03 14:44:33 +0100
commit8100a075b7dd7471562decb1860571a335d68b0d (patch)
tree331eebca0cbafd27aa691da4bc5fa281abb61d3d /extra/locale
parente018b8ba1a0110120429de34366459af0771abe2 (diff)
parent4ac7ad3543dd6d7780e71af80fa5c45414451719 (diff)
Merge commit 'origin/master' into prelink
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'extra/locale')
-rw-r--r--extra/locale/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/locale/Makefile b/extra/locale/Makefile
index 11f362a5e..ff229e20c 100644
--- a/extra/locale/Makefile
+++ b/extra/locale/Makefile
@@ -4,10 +4,10 @@
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-
top_srcdir=../../
-top_builddir=../../
+top_builddir=$(if $(O),$(O),../../)/
+
all: objs
-include $(top_builddir)Rules.mak
+include $(top_srcdir)Rules.mak
include Makefile.in
include $(top_srcdir)Makerules