From 0ca88aadd95a0be9cba986c417b4291f0bec9f37 Mon Sep 17 00:00:00 2001 From: russell Date: Wed, 24 Jan 2007 00:39:27 +0000 Subject: Merged revisions 1944 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.4 ................ r1944 | russell | 2007-01-23 18:38:19 -0600 (Tue, 23 Jan 2007) | 11 lines Merged revisions 1943 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r1943 | russell | 2007-01-23 18:35:48 -0600 (Tue, 23 Jan 2007) | 3 lines If the xpp pieces get built, install the userspace utilities as well. (issue #8894) ........ ................ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1945 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ab3d59e..933f44a 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ .EXPORT_ALL_VARIABLES: -.PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules linux24 linux26 xpp tests devel data stackcheck install-udev config update install-programs install-modules install-linux24 install-linux26 firmware install-include install-libs +.PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules linux24 linux26 xpp tests devel data stackcheck install-udev config update install-programs install-modules install-linux24 install-linux26 firmware install-include install-libs xpp-install PWD=$(shell pwd) @@ -365,7 +365,12 @@ else # DYNFS endif endif -install: all devices firmware install-libs install-include +xpp-install: +ifneq (,$(findstring xpp,$(obj-m))) + @$(MAKE) -C xpp/utils install +endif + +install: all devices firmware install-libs install-include xpp-install if [ -f ztcfg ]; then \ $(INSTALL) -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg; \ fi -- cgit v1.2.3