From 7a55ab54bd48c021ff74df3d23d3a41112694ae6 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Sat, 19 Jul 2008 16:42:22 +0000 Subject: [PATCH] apply patch for GNUSTEP_MAKEFILES from Yavor Doganov --- ChangeLog | 7 +++++++ configure | 2 +- configure.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3353ed48ada..c3d3830e24e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-07-17 Adrian Robert + + * configure.in: Apply patch from Yavor Doganov gnu.org> to + fix typo in GNUSTEP_MAKEFILES setting for HAVE_NS compilation under + GNUstep. + * configure: Regenerate. + 2008-07-18 Kenichi Handa * INSTALL (Complex Text Layout support libraries): Delete the diff --git a/configure b/configure index d51f1b6f3e3..8eac0485742 100755 --- a/configure +++ b/configure @@ -9348,7 +9348,7 @@ if test "${with_ns}" != no; then ns_appbindir=`pwd`/nextstep/Emacs.app ns_appresdir=`pwd`/nextstep/Emacs.app/Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base - GNUSTEP_MAKEFILES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_MAKEFILES)" + GNUSTEP_MAKEFILES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_MAKEFILES)" GNUSTEP_SYSTEM_HEADERS="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_SYSTEM_LIBRARIES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)" CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" diff --git a/configure.in b/configure.in index bce269b5294..6c7231c5265 100644 --- a/configure.in +++ b/configure.in @@ -1240,7 +1240,7 @@ if test "${with_ns}" != no; then ns_appbindir=`pwd`/nextstep/Emacs.app ns_appresdir=`pwd`/nextstep/Emacs.app/Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base - GNUSTEP_MAKEFILES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_MAKEFILES)" + GNUSTEP_MAKEFILES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_MAKEFILES)" GNUSTEP_SYSTEM_HEADERS="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_SYSTEM_LIBRARIES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)" CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" -- 2.39.2