Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

glew.pc.in tidy ups #425

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

glew.pc.in tidy ups #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d593a54
remove unused substitutions for glew.pc.in
heitbaum Dec 30, 2024
a24b6d4
use exec_prefix/lib for libdir in glew.pc.in
heitbaum Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,6 @@ tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wgl
glew.pc: glew.pc.in
sed \
-e "s|@prefix@|$(GLEW_PREFIX)|g" \
-e "s|@libdir@|$(LIBDIR)|g" \
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like LIBDIR varies.

$ grep LIBDIR config/*
config/Makefile.cygming:LIBDIR = /usr/lib/mingw
config/Makefile.cygming:LDFLAGS.EXTRA = -L$(LIBDIR)
config/Makefile.cygwin:LIBDIR = $(GLEW_DEST)/lib
config/Makefile.cygwin-x11:LIBDIR = $(GLEW_DEST)/lib
config/Makefile.flatpak-32:LIBDIR = $(GLEW_DEST)/lib32 
config/Makefile.linux:  LIBDIR = $(GLEW_DEST)/lib64
config/Makefile.linux:  LIBDIR = $(GLEW_DEST)/lib
config/Makefile.linux-32:LIBDIR = $(GLEW_DEST)/lib
config/Makefile.linux-clang:  LIBDIR = $(GLEW_DEST)/lib64
config/Makefile.linux-clang:  LIBDIR = $(GLEW_DEST)/lib
config/Makefile.msys:LIBDIR = $(GLEW_DEST)/bin
config/Makefile.nacl-32:LIBDIR =
config/Makefile.nacl-64:LIBDIR =

Same rationale for BINDIR and INCDIR, I expect.

-e "s|@exec_prefix@|$(BINDIR)|g" \
-e "s|@includedir@|$(INCDIR)|g" \
-e "s|@version@|$(GLEW_VERSION)|g" \
-e "s|@cflags@||g" \
-e "s|@libname@|$(NAME)|g" \
Expand Down
2 changes: 1 addition & 1 deletion glew.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=${prefix}
libdir=@libdir@
libdir=${exec_prefix}/lib
includedir=${prefix}/include

Name: glew
Expand Down