* s/darwin.h (OTHER_FILES): Do not define here, defined in

config.in.

* Makefile.in (ALL_OBJC_CFLAGS): New variable.
(.m.o): Use it.
* config.in: Regenerate.

* Makefile.in (INSTALLABLES): Add LIB_SRC_EXTRA_INSTALLABLES.  Do
not special case for NS_IMPL_COCOA.

* configure.in (LIB_SRC_EXTRA_INSTALLABLES): New variable.
AC_SUBST it.
(GNU_OBJC_CFLAGS): Define as a shell variable instead of #define.
AC_SUBST it.
(OTHER_FILES): Always define for HAVE_NS.
(C_SWITCH_X_SYSTEM): Don't define as empty for NS_IMPL_COCOA.
* configure: Regenerate.

2 files changed, 6 insertions, 6 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 48a50a5fb43..34e9df8289b 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (INSTALLABLES): Add LIB_SRC_EXTRA_INSTALLABLES.  Do
+        not special case for NS_IMPL_COCOA.
+
 2008-07-16  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
         * Makefile.in (CFLAGS): Drop -universal under NS_IMPL_COCOA.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 70bb8111c02..d9964518ffe 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -105,7 +105,7 @@ INSTALL_STRIP =
 
 # Things that a user might actually run,
 # which should be installed in bindir.
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT}
+INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@
 INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
@@ -144,11 +144,6 @@ MOVE_FLAGS=
 #define NOT_C_CODE
 #include "../src/config.h"
 
-#if defined(NS_IMPL_COCOA)
-/* Add mac-fix-env for OS X systems running NS version. */
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} mac-fix-env${EXEEXT}
-#endif
-
 /* Some s/SYSTEM.h files define this to request special libraries.  */
 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM