From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 30 Apr 2003 00:02:23 +0000 (+0000)
Subject: Make things function properly in case both LessTif and Open Motif are installed.
X-Git-Tag: ttn-vms-21-2-B4~10388
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=93a16fa8a8fd1fccfd2cb15cd16681f95bd3d701;p=emacs.git

Make things function properly in case both LessTif and Open Motif are installed.
---

diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 0115ab9c082..11368819f4a 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -9,6 +9,7 @@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
 CC=@CC@
 CFLAGS=@CFLAGS@
 CPP=@CPP@
+CPPFLAGS=@CPPFLAGS@
 LN_S=@LN_S@
 RANLIB=@RANLIB@
 # See below--@X_TOOLKIT_TYPE@ is used below.
@@ -31,11 +32,11 @@ TOOLKIT_DEFINES = -DUSE_$(USE_X_TOOLKIT)
 
 # ../src is needed to find config.h.
 ALL_CFLAGS= $(C_SWITCH_SITE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
-  $(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) $(CPPFLAGS) $(CFLAGS) \
+  $(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) $(CFLAGS) \
   -DHAVE_CONFIG_H -Demacs -I. -I../src -I${srcdir} -I${srcdir}/../src
 
 .c.o:
-	$(CC) -c ${ALL_CFLAGS} $<
+	$(CC) -c $(CPPFLAGS) ${ALL_CFLAGS} $<
 
 all:: liblw.a