From 3fbe1079bc96a57786a20c817b16f097fd8290f9 Mon Sep 17 00:00:00 2001 From: Jakob Nixdorf Date: Sat, 29 Aug 2015 18:33:28 +0200 Subject: [PATCH 1/2] Set the 'ar' command as variable in Makefile.tgl Allows the location of the ar binary to be changed by passing the argument AR=/path/to/ar to make. --- Makefile.tgl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.tgl b/Makefile.tgl index fc31c03..36a1d41 100644 --- a/Makefile.tgl +++ b/Makefile.tgl @@ -8,6 +8,8 @@ GENERATE_OBJECTS=${OBJ}/generate.o TGL_COMMON_OBJECTS=${OBJ}/tools.o TGL_OBJ_C=${GENERATE_OBJECTS} ${TGL_COMMON_OBJECTS} ${TGL_OBJECTS} ${TLD_OBJECTS} +AR?=ar + .SUFFIXES: .SUFFIXES: .c .h .o @@ -26,7 +28,7 @@ ${TGL_OBJECTS_AUTO}: ${OBJ}/auto/%.o: ${AUTO}/%.c | create_dirs # ${CC} ${INCLUDE} ${COMPILE_FLAGS} -iquote ${srcdir}/tgl -c -MP -MD -MF ${DEP}/auto/auto.d -MQ ${OBJ}/auto/auto.o -o $@ $< ${LIB}/libtgl.a: ${TGL_OBJECTS} ${TGL_COMMON_OBJECTS} ${TGL_OBJECTS_AUTO} - rm -f $@ && ar ruv $@ $^ + rm -f $@ && ${AR} ruv $@ $^ ${EXE}/generate: ${GENERATE_OBJECTS} ${TGL_COMMON_OBJECTS} ${CC} ${GENERATE_OBJECTS} ${TGL_COMMON_OBJECTS} ${LINK_FLAGS} -o $@ From 75a9b56ddb6ca044051120031d40adbb020e1f04 Mon Sep 17 00:00:00 2001 From: Jakob Nixdorf Date: Sat, 29 Aug 2015 18:37:02 +0200 Subject: [PATCH 2/2] Use pkg-config found in configure in make. --- Makefile.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index d537109..fd522f5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,6 +9,7 @@ DIR_PERM=0755 FILE_PERM=0644 CC=@CC@ +PKG_CONFIG=@PKG_CONFIG@ DEP=dep AUTO=auto @@ -28,8 +29,8 @@ PRPL_NAME=telegram-purple.so PRPL_LIBNAME=${EXE}/${PRPL_NAME} all: ${PRPL_LIBNAME} -PLUGIN_DIR_PURPLE=$(shell pkg-config --variable=plugindir purple) -DATA_ROOT_DIR_PURPLE=$(shell pkg-config --variable=datarootdir purple) +PLUGIN_DIR_PURPLE=$(shell ${PKG_CONFIG} --variable=plugindir purple) +DATA_ROOT_DIR_PURPLE=$(shell ${PKG_CONFIG} --variable=datarootdir purple) include ${srcdir}/Makefile.tl-parser include ${srcdir}/Makefile.tgl