remove the version numbers from the .pc files
we used to have minor version numbers in the pkg-confiog files, eg: pkg-config vips-7.28 --cflags The idea was to make working with multiple installed versions (something I do a lot at least) easier. But it was also annoying and made upgrading harder for downstream packages. And the benefits were very marginal.
This commit is contained in:
parent
bb95b54679
commit
5778dfac1a
@ -3,7 +3,7 @@
|
|||||||
if ENABLE_CXX
|
if ENABLE_CXX
|
||||||
C_COMPILE_DIR = libvipsCC
|
C_COMPILE_DIR = libvipsCC
|
||||||
C_DIST_DIR =
|
C_DIST_DIR =
|
||||||
C_PKGCONFIG = vipsCC-7.${VIPS_MINOR_VERSION}.pc
|
C_PKGCONFIG = vipsCC.pc
|
||||||
|
|
||||||
# turn on Python if we can (requires C++)
|
# turn on Python if we can (requires C++)
|
||||||
if HAVE_PYTHON
|
if HAVE_PYTHON
|
||||||
@ -32,15 +32,15 @@ EXTRA_DIST = \
|
|||||||
m4 \
|
m4 \
|
||||||
benchmark \
|
benchmark \
|
||||||
bootstrap.sh \
|
bootstrap.sh \
|
||||||
vips-7.${VIPS_MINOR_VERSION}.pc.in \
|
vips.pc.in \
|
||||||
vipsCC-7.${VIPS_MINOR_VERSION}.pc.in \
|
vipsCC.pc.in \
|
||||||
acinclude.m4 \
|
acinclude.m4 \
|
||||||
depcomp \
|
depcomp \
|
||||||
$(C_DIST_DIR) \
|
$(C_DIST_DIR) \
|
||||||
$(P_DIST_DIR)
|
$(P_DIST_DIR)
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = vips-7.${VIPS_MINOR_VERSION}.pc $(C_PKGCONFIG)
|
pkgconfig_DATA = vips.pc $(C_PKGCONFIG)
|
||||||
|
|
||||||
install-exec-hook:
|
install-exec-hook:
|
||||||
-rm -rf ${DESTDIR}$(datadir)/doc/vips
|
-rm -rf ${DESTDIR}$(datadir)/doc/vips
|
||||||
|
4
TODO
4
TODO
@ -1,7 +1,3 @@
|
|||||||
- try the nip2 test suite again
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
blocking bugs
|
blocking bugs
|
||||||
=============
|
=============
|
||||||
|
|
||||||
|
@ -218,7 +218,7 @@ if test x"$enable_cxx" != x"no"; then
|
|||||||
AC_DEFINE(ENABLE_CXX,1,[build C++ components])
|
AC_DEFINE(ENABLE_CXX,1,[build C++ components])
|
||||||
AM_CONDITIONAL(ENABLE_CXX, true)
|
AM_CONDITIONAL(ENABLE_CXX, true)
|
||||||
# need -lstdc++ for (eg.) the C++ format loaders
|
# need -lstdc++ for (eg.) the C++ format loaders
|
||||||
# this gets added to vips-7.xx.pc to help mingw and friends link programs
|
# this gets added to vips.pc to help mingw and friends link programs
|
||||||
# using libvips
|
# using libvips
|
||||||
VIPS_CXX_LIBS="-lstdc++"
|
VIPS_CXX_LIBS="-lstdc++"
|
||||||
enable_cxx=yes
|
enable_cxx=yes
|
||||||
@ -685,12 +685,9 @@ AC_SUBST(VIPS_LIBS)
|
|||||||
AC_SUBST(VIPS_CXX_LIBS)
|
AC_SUBST(VIPS_CXX_LIBS)
|
||||||
AC_SUBST(PACKAGES_USED)
|
AC_SUBST(PACKAGES_USED)
|
||||||
|
|
||||||
# you'd think we could have
|
|
||||||
# vips-$VIPS_MAJOR_VERSION.$VIPS_MINOR_VERSION.pc
|
|
||||||
# in AC_OUTPUT, but that seems to break for some combinations of sh/m4
|
|
||||||
AC_OUTPUT([
|
AC_OUTPUT([
|
||||||
vips-7.29.pc
|
vips.pc
|
||||||
vipsCC-7.29.pc
|
vipsCC.pc
|
||||||
Makefile
|
Makefile
|
||||||
libvips/include/vips/version.h
|
libvips/include/vips/version.h
|
||||||
libvips/include/Makefile
|
libvips/include/Makefile
|
||||||
|
Loading…
x
Reference in New Issue
Block a user