+++ /dev/null
---- klibc-1.0/klcc.in.orig 2005-03-07 22:44:49.000000000 +0100
-+++ klibc-1.0/klcc.in 2005-06-13 21:05:09.000000000 +0200
-@@ -1,22 +1,22 @@
- # -*- perl -*-
-
- # Standard includes
--@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}");
-
- # Default optimization options (for compiles without -g)
- @optopt = @OPTFLAGS;
- @goptopt = ('-O');
-
- # Standard library directories
--@stdlibpath = ("-L${prefix}/${KCROSS}lib");
-+@stdlibpath = ("-L${libdir}");
-
- # Options and libraries to pass to ld; shared versus static
--@staticopt = ("${prefix}/${KCROSS}lib/crt0.o");
--@staticlib = ("${prefix}/${KCROSS}lib/libc.a");
--@sharedopt = (@EMAIN, "${prefix}/${KCROSS}lib/interp.o");
--@sharedlib = ('-R', "${prefix}/${KCROSS}lib/libc.so");
-+@staticopt = ("${libdir}/klibc/crt0.o");
-+@staticlib = ("${libdir}/klibc/libc.a");
-+@sharedopt = (@EMAIN, "${libdir}/klibc/interp.o");
-+@sharedlib = ('-R', "${libdir}/klibc/libc.so");
-
- # Returns the language (-x option string) for a specific extension.
- sub filename2lang($) {
-@@ -164,6 +164,7 @@
- } elsif ( $a eq '-shared' ) {
- $shared = 1;
- } elsif ( $a eq '-static' ) {
-+ push(@ldopt, $a);
- $shared = 0;
- } elsif ( $a eq '-s' ) {
- $strip = 1;
---- klibc-1.0/Makefile.orig 2005-03-07 19:17:15.000000000 +0100
-+++ klibc-1.0/Makefile 2005-06-13 20:57:41.000000000 +0200
-@@ -27,10 +27,10 @@
- echo 'STRIPFLAGS=$(STRIPFLAGS)' >> $@
- echo 'EMAIN=$(EMAIN)' >> $@
- echo 'BITSIZE=$(BITSIZE)' >> $@
-- echo 'prefix=$(INSTALLDIR)' >> $@
-- echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@
-- echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@
-- echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@
-+ echo 'prefix=$(prefix)' >> $@
-+ echo 'bindir=$(bindir)' >> $@
-+ echo 'libdir=$(libdir)' >> $@
-+ echo 'includedir=$(includedir)' >> $@
-
- $(CROSS)klcc: klcc.in $(CROSS)klibc.config makeklcc.pl
- $(PERL) makeklcc.pl klcc.in $(CROSS)klibc.config \
+++ /dev/null
---- klibc-0.193/ash/mkinit.sh.orig 2004-12-12 19:02:12.000000000 +0100
-+++ klibc-0.193/ash/mkinit.sh 2004-12-12 19:41:26.328715408 +0100
-@@ -88,7 +88,7 @@
- IFS=' '
- set -- $line
- # Ignore those with arguments
-- [ "$2" = "${2##*(}" ] || continue
-+ [ "$2" = "${2##*\(}" ] || continue
- # and multiline definitions
- [ "$line" = "${line%\\}" ] || continue
- defines="${defines}#undef $2${nl}${line}${nl}"