@@ -22,10 +22,10 @@
$(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@
$(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@
- $(Q)echo 'VERSION=$(shell cat $(srctree)/version)' >> $@
+ $(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@
- $(Q)echo 'prefix=$(INSTALLDIR)' >> $@
- $(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@
- $(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@
-@includes = ("-I${prefix}/${KCROSS}include/arch/${ARCH}",
- "-I${prefix}/${KCROSS}include/bits${BITSIZE}",
- "-I${prefix}/${KCROSS}include");
-+@includes = ("-I${includedir}/arch/${ARCH}",
-+ "-I${includedir}/bits${BITSIZE}",
-+ "-I${includedir}");
++@includes = ("-idirafter", "${includedir}/arch/${ARCH}",
++ "-idirafter", "${includedir}/bits${BITSIZE}",
++ "-idirafter", "${includedir}");
# Default optimization options (for compiles without -g)
@optopt = @OPTFLAGS;