[svn-commits] file: branch file/zaptel-firmware r1950 - /team/file/zaptel-firmware/

[svn-commits at lists.digium.com]

Author: file
Date: Tue Jan 23 19:47:33 2007
New Revision: 1950

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1950
Log:
Merged revisions 1944 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1944 | russell | 2007-01-23 19:38:19 -0500 (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:
    team/file/zaptel-firmware/   (props changed)
    team/file/zaptel-firmware/Makefile

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 23 19:47:33 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1938
+/branches/1.4:1-1949

Modified: team/file/zaptel-firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/Makefile?view=diff&rev=1950&r1=1949&r2=1950
==============================================================================
--- team/file/zaptel-firmware/Makefile (original)
+++ team/file/zaptel-firmware/Makefile Tue Jan 23 19:47:33 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)
 
@@ -372,7 +372,12 @@
   endif
 endif
 
-install: all devices 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
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 	$(MAKE) -C firmware hotplug-install
 endif