summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-20 10:35:10 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-20 10:35:19 +0200
commit271074360986b53fa49d8ff8c4abd9270686efa9 (patch)
treed60cf3c61bc06ea471abfc2361d3b439ece71af6 /package
parent4da06b87c1295787a215c5ad51ec2816d8484256 (diff)
fix installation of aclocal files
Diffstat (limited to 'package')
-rw-r--r--package/glib/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 9d703b7d9..3e0cb1288 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= glib
PKG_VERSION:= 2.40.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_EXTRAVER:= 2.40
PKG_MD5SUM:= 05fb7cb17eacbc718e90366a1eae60d9
PKG_DESCR:= low-level core library that forms the basis of gtk+
@@ -41,8 +41,7 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \
HOST_STYLE:= auto
HOST_CONFIGURE_ARGS+= --disable-fam \
--enable-static \
- --disable-compile-warnings \
- --datadir=${STAGING_HOST_DIR}/usr/share
+ --disable-compile-warnings
glib-install:
${INSTALL_DIR} ${IDIR_GLIB}/usr/lib
@@ -51,8 +50,6 @@ glib-install:
${CP} ${WRKINST}/usr/lib/libgobject*.so* ${IDIR_GLIB}/usr/lib
${CP} ${WRKINST}/usr/lib/libgmodule*.so* ${IDIR_GLIB}/usr/lib
${CP} ${WRKINST}/usr/lib/libgthread*.so* ${IDIR_GLIB}/usr/lib
- ${CP} ${WRKINST}/usr/share/aclocal/* \
- ${STAGING_HOST_DIR}/usr/share/aclocal
# workaround for dev subpackage
${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/include
${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/lib/glib-2.0/include