X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fplatforms.mk;h=45bd3a1b8a10afa9843c04071c3af66c89a37531;hb=9d42087149a6870965896be74dc6260f72d2cac9;hp=f491ee5957190f2da928da4be5724c7217485f4b;hpb=afaa85f873a7bff1cf1e32c22f909af3018ccfee;p=vpp.git

diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index f491ee59571..45bd3a1b8a1 100644
--- 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 ;					\
@@ -78,6 +78,10 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	: dev package needs a couple of additions ;			\
 	echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/bin/vppapigen /usr/bin	\
 	   >> deb/debian/vpp-dev.install ;				\
+	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 ../../src/vpp-api/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	\
@@ -94,20 +98,3 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	dpkg-buildpackage -us -uc -b					\
 	)
 
-.PHONY: install-rpm
-install-rpm: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
-	@$(BUILD_ENV) ;							\
-	set -eu$(BUILD_DEBUG) ;						\
-	$(MAKE) -C $(MU_BUILD_ROOT_DIR)					\
-	    $(patsubst %,%-install,					\
-	      $(ROOT_PACKAGES))	|| exit 1;				\
-									\
-	cd rpm ;							\
-	mkdir -p SOURCES ;                                              \
-	if test -f *.tar.gz ; then mv *.tar.gz SOURCES ; fi ;           \
-	rpmbuild -bb --define "_topdir $$PWD" --define			\
-		"_install_dir $(INSTALL_PREFIX)$(ARCH)"                 \
-		--define "_mu_build_root_dir $(MU_BUILD_ROOT_DIR)"      \
-		vpp.spec ;                                              \
-	mv $$(find RPMS -name \*.rpm -type f) ..
-