From: Alan T. DeKok Date: Fri, 28 Sep 2012 11:41:18 +0000 (+0200) Subject: Fix to work with jlibtool X-Git-Tag: release_3_0_0_beta1~1672 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55dbf03e4aa08d40e0b69ba8e813601c0bc34769;p=thirdparty%2Ffreeradius-server.git Fix to work with jlibtool --- diff --git a/src/modules/rlm_sql/drivers/rules.mak b/src/modules/rlm_sql/drivers/rules.mak index d2c32d82815..78a1f0f7141 100644 --- a/src/modules/rlm_sql/drivers/rules.mak +++ b/src/modules/rlm_sql/drivers/rules.mak @@ -73,7 +73,7 @@ ifneq ($(TARGET),) # Yes, this is a horrible hack. # ifeq ($(findstring $(TARGET),$(STATIC_MODULES)),) -LINK_MODE=-export-dynamic +LINK_MODE=-export-dynamic -rpath ${libdir} -rdynamic else LINK_MODE=-static endif @@ -104,7 +104,7 @@ build-module: $(TARGET).la $(TARGET).la: $(LT_OBJS) @echo LINK $@ $^ @$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ - -module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \ + $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \ -rpath $(libdir) $^ $(RLM_SQL_LIBS) ####################################################################### @@ -148,7 +148,7 @@ reconfig: install: if [ "x$(TARGET)" != "x" ]; then \ $(LIBTOOL) --mode=install $(INSTALL) -c \ - $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \ + -rpath $(libdir) $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \ rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \ ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \ fi