[zaptel-commits] russell: trunk r1945 - in /trunk: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: russell
Date: Tue Jan 23 18:39:27 2007
New Revision: 1945

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

........

................

Modified:
    trunk/   (props changed)
    trunk/Makefile

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

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Jan 23 18:39:27 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=1945&r1=1944&r2=1945
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Jan 23 18:39:27 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)
 
@@ -365,7 +365,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