diff --git a/Makefile.in b/Makefile.in
index 009bc57..9d16914 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,12 +3,13 @@ VPATH=%VPATH%
 # FIXME: We specificially need bash for one of the build rules
 SHELL=/bin/bash
 
-UNAME=$(shell uname)
-
-ifeq ($(UNAME),Darwin)
+ifeq ($(CFG_OSTYPE),apple-darwin)
     OSTYPE=darwin
 endif
-ifeq ($(UNAME),Linux)
+ifeq ($(CFG_OSTYPE),unknown-linux-gnu)
+    OSTYPE=linux
+endif
+ifeq ($(CFG_OSTYPE),linux-androideabi)
     OSTYPE=linux
 endif
 
@@ -183,10 +184,10 @@ CFLAGS += -I$(VPATH)/src -I$(VPATH)/include -I$(VPATH)/../libwapcaplet/include -
 .PHONY: all
 all: libcss.dummy
 
-PROPERTY_PARSER_GEN_OBJS = $(patsubst %.c,%.o,$(PROPERTY_PARSER_GEN_C_SRC))
+PROPERTY_PARSER_GEN_OBJS = $(patsubst %.c,%.o_sys,$(PROPERTY_PARSER_GEN_C_SRC))
 
 css_property_parser_gen: $(PROPERTY_PARSER_GEN_OBJS)
-	$(CC) $(CFLAGS) -o $@ $<
+	gcc $(CFLAGS) -o $@ $<
 
 
 
@@ -207,6 +208,9 @@ libcss.a: $(C_OBJS) gen_properties.dummy
 %.o: %.c
 	mkdir -p `dirname $@` && $(CC) $(CFLAGS) -o $@ -c $<
 
+%.o_sys: %.c
+	mkdir -p `dirname $@` && gcc $(CFLAGS) -o $@ -c $<
+
 libcss.dummy: libcss.a
 	touch $@
 
@@ -215,6 +219,6 @@ check:
 
 .PHONY: clean
 clean:
-	rm -f *.so *.a *.dylib *.dll *.dummy gen_prop*.o css_property_parser_gen gen_prop*.c src/*.o src/*/*.o src/*/*/*.o
+	rm -f *.so *.a *.dylib *.dll *.dummy gen_prop*.o css_property_parser_gen gen_prop*.c src/*.o src/*/*.o src/*/*/*.o src/*.o_sys src/*/*.o_sys src/*/*/*.o_sys
 
 
diff --git a/configure b/configure
index 5175bb3..0183abc 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,4 @@
 #!/bin/bash
 
 SRCDIR="$(cd $(dirname $0) && pwd)"
-sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile
-
-
+sed -e "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile