From 3637c1eb14a345efc9be1a70e56ab00774e5d585 Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Tue, 17 Nov 2009 19:03:34 +0100 Subject: [PATCH] fix motifless build, keep original LIBS variable --- motifless-nc.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/motifless-nc.patch b/motifless-nc.patch index 51feaf0..cbc6d4f 100644 --- a/motifless-nc.patch +++ b/motifless-nc.patch @@ -21,7 +21,7 @@ diff --quilt old/source/Makefile.common new/source/Makefile.common $(CC) $(CFLAGS) -c linkdate.c $(CC) $(CFLAGS) $(OBJS) linkdate.o $(XMLLIB) \ - $(XLTLIB) ../util/libNUtil.a $(LIBS) -o $@ -+ $(XLTLIB) ../util/libNUtil.a $(XMLIBS) $(XLIBS) -o $@ ++ $(XLTLIB) ../util/libNUtil.a $(XMLIBS) $(LIBS) -o $@ -# Note LIBS isn't quite right here; it links unnecessarily against Motif -nc: nc.o server_common.o ../util/libNUtil.a @@ -32,7 +32,7 @@ diff --quilt old/source/Makefile.common new/source/Makefile.common + ../util/prefFile.o \ + ../util/wmdesktop.o \ + ../util/clearcase.o -+ $(CC) $(CFLAGS) $^ $(XLIBS) -o $@ ++ $(CC) $(CFLAGS) $^ $(LIBS) -o $@ help.o: help.c $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@ @@ -160,7 +160,7 @@ diff --quilt old/makefiles/Makefile.bertw new/makefiles/Makefile.bertw ARFLAGS=-urs -LIBS += -lXm -lXmu -lXp -lXext -lXt -lSM -lICE -lX11 -lm -+XLIBS += -lXmu -lXp -lXext -lXt -lSM -lICE -lX11 -lm ++LIBS += -lXmu -lXp -lXext -lXt -lSM -lICE -lX11 -lm +XMLIBS += -lXm ifdef OM231 -- 2.11.4.GIT