Move java api to extras/

[vpp.git] / build-data / platforms.mk

diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 7904cc4..a8bd44e 100644 (file)
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -36,7 +36,7 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
        find $(INSTALL_PREFIX)$(ARCH)/*/lib* \( -type f -o  -type l \)  \
          -print | egrep -e '*\.so\.*\.*\.*'                            \
          | grep -v plugins\/                                           \
-         | sed -e 's:.*:../& /usr/lib/x86_64-linux-gnu:'               \
+         | sed -e 's:.*:../& /usr/lib/$(MACHINE)-linux-gnu:'           \
            > deb/debian/vpp-lib.install ;                              \
                                                                        \
        : vnet api definitions ;                                        \
@@ -75,10 +75,18 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
        echo ../../src/scripts/vppctl-cmd-list /usr/share/vpp           \
           >> deb/debian/vpp.install ;                                  \
                                                                        \
+       : add log directory ;                                           \
+       echo /var/log/vpp/                                              \
+          >> deb/debian/vpp.dirs ;                                     \
+                                                                       \
        : dev package needs a couple of additions ;                     \
        echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/bin/vppapigen /usr/bin     \
           >> deb/debian/vpp-dev.install ;                              \
-       echo ../../src/vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin       \
+       echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/C.py /usr/share/vpp  \
+          >> deb/debian/vpp-dev.install ;                              \
+       echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/JSON.py /usr/share/vpp \
+          >> deb/debian/vpp-dev.install ;                              \
+       echo ../../extras/japi/java/jvpp/gen/jvpp_gen.py /usr/bin       \
           >> deb/debian/vpp-dev.install ;                              \
        for i in $$(ls ../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do   \
           echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen       \