diff options
| author | Tom Fogal <[email protected]> | 2009-04-29 10:32:46 -0600 |
|---|---|---|
| committer | Dan Nicholson <[email protected]> | 2009-04-29 12:15:07 -0700 |
| commit | a9c97c5f2a9b880d01336a23134600e4b34429d0 (patch) | |
| tree | e9076fdd84cfbf34984ba493e3cc3dbeecc6eb5a /src/glut/mini | |
| parent | 66f978625685d83b04c32b19b62c3cb8c0d25f74 (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 <[email protected]>
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 841a473f891..0e42436133d 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 ae0689d7e81..151dd0b802b 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@ |