tags 620795 + patch thanks For the record, here is the patch that has been applied in Ubuntu already. It seems to work (building right now).
Sven
Index: emacs23-23.3+1/lib-src/Makefile.in =================================================================== --- emacs23-23.3+1.orig/lib-src/Makefile.in +++ emacs23-23.3+1/lib-src/Makefile.in @@ -141,6 +141,9 @@ # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ +/* Make sure a built-in define doesn't break our multiarch include path! */ +#undef i386 + #define THIS_IS_MAKEFILE #define NOT_C_CODE #include "../src/config.h" Index: emacs23-23.3+1/src/Makefile.in =================================================================== --- emacs23-23.3+1.orig/src/Makefile.in +++ emacs23-23.3+1/src/Makefile.in @@ -73,6 +73,9 @@ # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ +/* Make sure a built-in define doesn't break our multiarch include path! */ +#undef i386 + C_SWITCH_SYSTEM= /* just to be sure the sh is used */
