summaryrefslogtreecommitdiff
path: root/src/glu
diff options
context:
space:
mode:
authorTom Fogal <tfogal@alumni.unh.edu>2009-04-29 10:32:46 -0600
committerDan Nicholson <dbn.lists@gmail.com>2009-04-29 12:15:07 -0700
commita9c97c5f2a9b880d01336a23134600e4b34429d0 (patch)
treee9076fdd84cfbf34984ba493e3cc3dbeecc6eb5a /src/glu
parent66f978625685d83b04c32b19b62c3cb8c0d25f74 (diff)
Use variable library name in pkg-config output.
Previously the pkg-config output files would contain e.g. `-lGL' and `-lGLU', even if the user modified their configuration to build libraries with different names. This modifies the pkg-config inputs, and corresponding makery, so that modifying the output library name will cause the appropriate updated name to appear in the pkg-config `-l' option. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Diffstat (limited to 'src/glu')
-rw-r--r--src/glu/Makefile3
-rw-r--r--src/glu/glu.pc.in2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/glu/Makefile b/src/glu/Makefile
index e519dfeec4..5c26ead1bb 100644
--- a/src/glu/Makefile
+++ b/src/glu/Makefile
@@ -22,7 +22,8 @@ pcedit = sed \
-e 's,@GLU_PC_REQ@,$(GLU_PC_REQ),' \
-e 's,@GLU_PC_REQ_PRIV@,$(GLU_PC_REQ_PRIV),' \
-e 's,@GLU_PC_LIB_PRIV@,$(GLU_PC_LIB_PRIV),' \
- -e 's,@GLU_PC_CFLAGS@,$(GLU_PC_CFLAGS),'
+ -e 's,@GLU_PC_CFLAGS@,$(GLU_PC_CFLAGS),' \
+ -e 's,@GLU_LIB@,$(GLU_LIB),'
glu.pc: glu.pc.in
$(pcedit) $< > $@
diff --git a/src/glu/glu.pc.in b/src/glu/glu.pc.in
index bc2517e90e..f7d9109823 100644
--- a/src/glu/glu.pc.in
+++ b/src/glu/glu.pc.in
@@ -8,6 +8,6 @@ Description: Mesa OpenGL Utility library
Requires: @GLU_PC_REQ@
Requires.private: @GLU_PC_REQ_PRIV@
Version: @VERSION@
-Libs: -L${libdir} -lGLU
+Libs: -L${libdir} -l@GLU_LIB@
Libs.private: @GLU_PC_LIB_PRIV@
Cflags: -I${includedir} @GLU_PC_CFLAGS@