From: Jeremy H. <jer...@fr...> - 2010-04-01 21:37:06
|
On Apr 1, 2010, at 14:10, Dan Nicholson wrote: > On Thu, Apr 1, 2010 at 12:35 PM, Jeremy Huddleston > <jer...@fr...> wrote: >> >> Signed-off-by: Jeremy Huddleston <jer...@ap...> >> --- >> progs/xdemos/Makefile | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile >> index e87d55d..d5c627a 100644 >> --- a/progs/xdemos/Makefile >> +++ b/progs/xdemos/Makefile >> @@ -11,7 +11,7 @@ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) >> # Add X11 and pthread libs to satisfy GNU gold. >> APP_LIB_DEPS += -lX11 -lpthread >> >> -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS) >> +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_LIB_DIR) $(APP_LIB_DEPS) > > Is this against master? We changed this to use $(X11_LIBS), which is > unfortunately only filled in by configure. BTW, what config are you > using, and what prevents you from using autoconf? This is against 7.8 ... perhaps you should cherry-pick the appropriate change into the 7.8 branch then. I'm using the "darwin" config. I can't use autoconf because it is nowhere near capable of handling darwin, and I haven't wanted to address the issue until the transition to autotools was completed. |