diff options
author | Tom Fogal <tfogal@alumni.unh.edu> | 2009-04-29 10:32:46 -0600 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2011-07-11 20:05:25 +0100 |
commit | 8e05d9474b6f1bf25acad7469dbeb45b0828e058 (patch) | |
tree | 3d7a7ffd0c69ff636cc534802d566f877057e76b /src/glut/mini | |
parent | e05abc3a4bb5bcc1dd342dc3c9e0f96ee9d82c6d (diff) | |
download | glut-8e05d9474b6f1bf25acad7469dbeb45b0828e058.tar.gz |
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/glut/mini')
-rw-r--r-- | src/glut/mini/Makefile | 3 | ||||
-rw-r--r-- | src/glut/mini/glut.pc.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile index 841a473..0e42436 100644 --- a/src/glut/mini/Makefile +++ b/src/glut/mini/Makefile @@ -81,7 +81,8 @@ pcedit = sed \ -e 's,@VERSION@,$(GLUT_MAJOR).$(GLUT_MINOR).$(GLUT_TINY),' \ -e 's,@GLUT_PC_REQ_PRIV@,$(GLUT_PC_REQ_PRIV),' \ -e 's,@GLUT_PC_LIB_PRIV@,$(GLUT_PC_LIB_PRIV),' \ - -e 's,@GLUT_PC_CFLAGS@,$(GLUT_PC_CFLAGS),' + -e 's,@GLUT_PC_CFLAGS@,$(GLUT_PC_CFLAGS),' \ + -e 's,@GLUT_LIB@,$(GLUT_LIB),' glut.pc: glut.pc.in $(pcedit) $< > $@ diff --git a/src/glut/mini/glut.pc.in b/src/glut/mini/glut.pc.in index ae0689d..151dd0b 100644 --- a/src/glut/mini/glut.pc.in +++ b/src/glut/mini/glut.pc.in @@ -8,6 +8,6 @@ Description: Mesa OpenGL Utility Toolkit library Requires: gl glu Requires.private: @GLUT_PC_REQ_PRIV@ Version: @VERSION@ -Libs: -L${libdir} -lglut +Libs: -L${libdir} -l@GLUT_LIB@ Libs.private: @GLUT_PC_LIB_PRIV@ Cflags: -I${includedir} @GLUT_PC_CFLAGS@ |