Regen from zproject to fix qt-android

zeromq · Sep 27, 2015 · 019d76b · 019d76b
1 parent 617c8ff
commit 019d76b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/builds/qt-android/android_build_helper.sh b/builds/qt-android/android_build_helper.sh
@@ -236,6 +236,7 @@ function android_build_opts {
     ANDROID_BUILD_OPTS+=("LDFLAGS=${LDFLAGS} ${ANDROID_BUILD_EXTRA_LDFLAGS}")
     ANDROID_BUILD_OPTS+=("LIBS=${LIBS} ${ANDROID_BUILD_EXTRA_LIBS}")
 
+    ANDROID_BUILD_OPTS+=("PKG_CONFIG_LIBDIR=${ANDROID_NDK_ROOT}/prebuilt/linux-x86_64/lib/pkgconfig")
     ANDROID_BUILD_OPTS+=("PKG_CONFIG_PATH=${ANDROID_BUILD_PREFIX}/lib/pkgconfig")
     ANDROID_BUILD_OPTS+=("--host=${TOOLCHAIN_HOST}")
     ANDROID_BUILD_OPTS+=("--prefix=${ANDROID_BUILD_PREFIX}")

diff --git a/src/Makemodule.am b/src/Makemodule.am
@@ -152,6 +152,24 @@ src_czmq_selftest_LDADD = ${program_libs}
 src_czmq_selftest_SOURCES = src/czmq_selftest.c
 
 
+# Install api files into /usr/local/share/zproject
+apidir = @datadir@/zproject/czmq
+dist_api_DATA = \
+    api/zactor.xml \
+    api/zdir.xml \
+    api/zdir_patch.xml \
+    api/zfile.xml \
+    api/zframe.xml \
+    api/zhashx.xml \
+    api/ziflist.xml \
+    api/zloop.xml \
+    api/zmsg.xml \
+    api/zsock.xml \
+    api/ztrie.xml \
+    api/zuuid.xml \
+    api/zhash.xml \
+    api/zlist.xml
+
 # define custom target for all products of /src
 src: src/libczmq.la src/czmq_selftest