[zaptel-commits] russell: branch 1.4 r1944 - in /branches/1.4: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: russell
Date: Tue Jan 23 18:38:19 2007
New Revision: 1944

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1944
Log:
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)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/Makefile

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=1944&r1=1943&r2=1944
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Tue Jan 23 18:38:19 2007
@@ -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)
 
@@ -358,7 +358,12 @@
   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