various small cleanups detailed in changelogs

1 files changed, 4 insertions, 5 deletions

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 9b537ecfbea..482103ddeb3 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -144,7 +144,7 @@ MOVE_FLAGS=
 #define NOT_C_CODE
 #include "../src/config.h"
 
-#if defined(COCOA)
+#if defined(NS_IMPL_COCOA)
 /* Build these programs as universal binaries. */
 CFLAGS := $(CFLAGS) -universal
 /* Add mac-fix-env for OS X systems running NS version. */
@@ -278,14 +278,13 @@ BASE_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
    Using an explicit command made it work.  */
 .c.o:
         ${CC} -c ${CPP_CFLAGS} $<
-#ifdef HAVE_NS
+
 .m.o:
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
         $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString $<
 #else
         $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
 #endif
-#endif
 
 all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 
@@ -483,7 +482,7 @@ update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H)
         $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \
           -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\""
 
-#if defined(COCOA)
+#if defined(NS_IMPL_COCOA)
 mac-fix-env: ${srcdir}/mac-fix-env.m
         $(CC) -o mac-fix-env ${srcdir}/mac-fix-env.m -prebind -framework Foundation
 #endif