Skip to content

Commit

Permalink
Don't use PKG_INSTALLDIR just yet, it breaks pkg-config < 0.27.
Browse files Browse the repository at this point in the history
This reverts commit 7c714a8.
  • Loading branch information
jlindgren90 committed Feb 3, 2013
1 parent 14d203d commit 033162b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -9,7 +9,7 @@ include buildsys.mk
install-extra:
for i in audacious.pc audclient.pc; do \
${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${pkgconfigdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${pkgconfigdir}/$$i; then \
if ${MKDIR_P} ${DESTDIR}${libdir}/pkgconfig && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/pkgconfig/$$i; then \
${INSTALL_OK}; \
else \
${INSTALL_FAILED}; \
Expand Down
1 change: 0 additions & 1 deletion buildsys.mk.in
Expand Up @@ -73,7 +73,6 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
libdir = @libdir@
pkgconfigdir = @pkgconfigdir@
plugindir ?= ${libdir}/${PACKAGE_NAME}
datarootdir = @datarootdir@
datadir = @datadir@
Expand Down
2 changes: 0 additions & 2 deletions configure.ac
Expand Up @@ -23,8 +23,6 @@ BUILDSYS_INIT
BUILDSYS_SHARED_LIB
AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins])

PKG_INSTALLDIR

dnl Byte order
dnl ==========
AC_C_BIGENDIAN([BIGENDIAN=1], [BIGENDIAN=0],
Expand Down

0 comments on commit 033162b

Please sign in to comment.