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

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index cdffeccb82621409c3a3d916a16fd32c0bda2365..d8ffec3c64156e0876ea6a31fdddcd4b5ddf7e3b 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-30  Lute Kamstra  <Lute.Kamstra@cwi.nl>
+
+       * Makefile.in: Make things function properly in case both LessTif
+       and Open Motif are installed.
+
 2003-03-18  Francesco Potort\e,Al\e(B  <pot@gnu.org>
 
        * Version 21.3 released.
@@ -7,7 +12,6 @@
        * lwlib-Xm.c (update_one_menu_entry): Deallocate widget_list.
        (destroy_all_children): Call it self to destroy sub menu children.
 
-
 2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * Version 21.2 released.

diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 7a3eb8fd815762d64d395ebe736b87b67cca4bac..c1253a857b1fb002821321e1a2691043d644589f 100644 (file)
--- 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.
@@ -32,12 +33,12 @@ 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) \
   -DEMACS_BITMAP_FILES -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