Generate a correct libfontconfig.la on static only architectures.

2 files changed, 14 insertions, 6 deletions

diff --git a/lib/fontconfig/src/Makefile b/lib/fontconfig/src/Makefile
index 672695dd0..ee8aaec7e 100644
--- a/lib/fontconfig/src/Makefile
+++ b/lib/fontconfig/src/Makefile
@@ -1,4 +1,6 @@
-#	$OpenBSD: Makefile,v 1.4 2013/03/17 20:46:47 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.5 2013/04/25 06:53:38 matthieu Exp $
+
+.include <bsd.xconf.mk>
 
 FONTCONFIG=	${.CURDIR}/../../../dist/fontconfig
 
@@ -65,11 +67,17 @@ fcobjshash.h: fcobjshash.gperf
 
 beforedepend: fcalias.h fcftalias.h fcobjshash.h lib${LIB}.la
 
+.if ${XENOCARA_HAVE_SHARED_LIBS:L} == "yes"
+lib${LIB}.la: ${.CURDIR}/lib${LIB}.la.in
+	sed -e 's#@libdir@#${LIBDIR}#g' \
+	     -e 's#@sharedlibfontconfig@#libfontconfig.so.${SHLIB_MAJOR}.${SHLIB_MINOR}#g' \
+	< $? > $@
+.else
 lib${LIB}.la: ${.CURDIR}/lib${LIB}.la.in
-	@sed -e 's#@libdir@#${LIBDIR}#g' \
-	     -e 's#@major@#${SHLIB_MAJOR}#g' \
-	     -e 's#@minor@#${SHLIB_MINOR}#g' \
+	sed -e 's#@libdir@#${LIBDIR}#g' \
+	     -e 's#@sharedlibfontconfig@##g' \
 	< $? > $@
+.endif
 
 afterinstall:
 	${INSTALL_DATA} lib${LIB}.la ${DESTDIR}${LIBDIR}
diff --git a/lib/fontconfig/src/libfontconfig.la.in b/lib/fontconfig/src/libfontconfig.la.in
index b5c9717ce..32ec939c5 100644
--- a/lib/fontconfig/src/libfontconfig.la.in
+++ b/lib/fontconfig/src/libfontconfig.la.in
@@ -5,10 +5,10 @@
 # It is necessary for linking the library.
 
 # The name that we can dlopen(3).
-dlname='libfontconfig.so.@major@.@minor@'
+dlname='@sharedlibfontconfig@'
 
 # Names of this library.
-library_names='libfontconfig.so.@major@.@minor@'
+library_names='@sharedlibfontconfig@'
 
 # The name of the static archive.
 old_library='libfontconfig.a'