From f8c5e98065d401e3258244ed202d72b69c923708 Mon Sep 17 00:00:00 2001 From: Kevin Layer <layer@franz.com> Date: Sun, 1 Jul 2012 08:49:58 -0700 Subject: [PATCH] bug21195: fix variable used in last commit Change-Id: I74b35e026374193b853031eadfbe6324dd590aa5 --- Makefile.amd64 | 8 ++++---- Makefile.linux | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.amd64 b/Makefile.amd64 index 8a28a09f..2df3f576 100644 --- a/Makefile.amd64 +++ b/Makefile.amd64 @@ -5,11 +5,11 @@ Makefile=Makefile.amd64 ifeq ($(shell if test -d /usr/include/openmotif; then echo yes; fi),yes) XINCLUDES = -I/usr/include/openmotif -XLIB = /usr/lib64/openmotif +XLIBDIR = /usr/lib64/openmotif endif XINCLUDES ?= /usr/X11R6/include -XLIB ?= /usr/X11R6/lib64 +XLIBDIR ?= /usr/X11R6/lib64 TKLIB=-lXm -lXpm -lXext -lXp XTLIB=-lXt @@ -22,7 +22,7 @@ else THREADLIB = -lpthread endif -SET_LIBRARY_PATH = LD_RUN_PATH=$(XLIB):/lib:/usr/lib; export LD_RUN_PATH +SET_LIBRARY_PATH = LD_RUN_PATH=$(XLIBDIR):/lib:/usr/lib; export LD_RUN_PATH PRODUCT-OBJS= $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(SHARED-XM-OBJS) @@ -30,7 +30,7 @@ PRODUCT-OBJS= $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(SHARED-XM-OBJS) PICFLAGS = -fPIC SHAREFLAGS = -MAKE_SHARED = ld -shared -L$(XLIB) +MAKE_SHARED = ld -shared -L$(XLIBDIR) STD_DEFINES = -DSVR4 -DSYSV AR = ar cq diff --git a/Makefile.linux b/Makefile.linux index 5cd74fe2..dc28dd11 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -5,11 +5,11 @@ Makefile=Makefile.linux ifeq ($(shell if test -d /usr/include/openmotif; then echo yes; fi),yes) XINCLUDES = -I/usr/include/openmotif -XLIB = /usr/lib/openmotif +XLIBDIR = /usr/lib/openmotif endif XINCLUDES ?= /usr/X11R6/include -XLIB ?= /usr/X11R6/lib +XLIBDIR ?= /usr/X11R6/lib TKLIB=-lXm -lXpm -lXext -lXp XTLIB=-lXt @@ -22,7 +22,7 @@ else THREADLIB = -lpthread endif -SET_LIBRARY_PATH = LD_RUN_PATH=$(XLIB):/lib:/usr/lib; export LD_RUN_PATH +SET_LIBRARY_PATH = LD_RUN_PATH=$(XLIBDIR):/lib:/usr/lib; export LD_RUN_PATH PRODUCT-OBJS= $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(SHARED-XM-OBJS) @@ -30,7 +30,7 @@ PRODUCT-OBJS= $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(SHARED-XM-OBJS) #PICFLAGS = -K pic SHAREFLAGS = -MAKE_SHARED = ld -shared -L$(XLIB) +MAKE_SHARED = ld -shared -L$(XLIBDIR) STD_DEFINES = -DSVR4 -DSYSV AR = ar cq -- GitLab