Skip to content

Commit 07cd71b

Browse files
committed
Merge pull request eclipse-paho#120 from zaporozhets/master
Add ldconfig handling
2 parents 1c376fe + 2bbcc2d commit 07cd71b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ CCFLAGS_SO = -g -fPIC $(CFLAGS) -Os -Wall -fvisibility=hidden
119119
FLAGS_EXE = $(LDFLAGS) -I ${srcdir} -lpthread -L ${blddir}
120120
FLAGS_EXES = $(LDFLAGS) -I ${srcdir} ${START_GROUP} -lpthread -lssl -lcrypto ${END_GROUP} -L ${blddir}
121121

122+
LDCONFIG ?= /sbin/ldconfig
122123
LDFLAGS_C = $(LDFLAGS) -shared -Wl,-init,$(MQTTCLIENT_INIT) -lpthread
123124
LDFLAGS_CS = $(LDFLAGS) -shared $(START_GROUP) -lpthread $(EXTRA_LIB) -lssl -lcrypto $(END_GROUP) -Wl,-init,$(MQTTCLIENT_INIT)
124125
LDFLAGS_A = $(LDFLAGS) -shared -Wl,-init,$(MQTTASYNC_INIT) -lpthread
@@ -227,7 +228,7 @@ install: build
227228
$(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_A_TARGET} $(DESTDIR)${libdir}
228229
$(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_AS_TARGET} $(DESTDIR)${libdir}
229230
$(INSTALL_PROGRAM) ${INSTALL_OPTS} ${MQTTVERSION_TARGET} $(DESTDIR)${bindir}
230-
/sbin/ldconfig $(DESTDIR)${libdir}
231+
$(LDCONFIG) $(DESTDIR)${libdir}
231232
ln -s lib$(MQTTLIB_C).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so
232233
ln -s lib$(MQTTLIB_CS).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so
233234
ln -s lib$(MQTTLIB_A).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so
@@ -242,7 +243,7 @@ uninstall:
242243
rm $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so.${VERSION}
243244
rm $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so.${VERSION}
244245
rm $(DESTDIR)${bindir}/MQTTVersion
245-
/sbin/ldconfig $(DESTDIR)${libdir}
246+
$(LDCONFIG) $(DESTDIR)${libdir}
246247
rm $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so
247248
rm $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so
248249
rm $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so

0 commit comments

Comments
 (0)