[svn-commits] russell: branch 1.2 r2018 - /branches/1.2/Makefile

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Jan 30 12:11:11 2007
New Revision: 2018

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2018
Log:
- Make the build of xpp occur with 2.6.8 or above, instead of 2.6.10
- remove the installation of the userspace tools
- remove the architecture check
(issue #8894, tzafrir)

Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2018&r1=2017&r2=2018
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Tue Jan 30 12:11:11 2007
@@ -126,7 +126,7 @@
 # This line is only meaningful when this Makefile is used as kconfig for 
 # 2.6 build
 
-ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && echo 1))
+ifneq (,$(shell [ 0$(SUBLEVEL) -ge 8 ] && echo 1))
 obj-m+=xpp/
 endif
 
@@ -315,12 +315,7 @@
 	tar -zxf mISDNuser.tar.gz
 	$(MAKE) -C mISDNuser install
 
-xpp-install: FORCE
-ifneq (,$(findstring xpp,$(obj-m)))
-	@$(MAKE) -C xpp/utils install
-endif
-
-install: all devices firmware xpp-install
+install: all devices firmware
 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
 	if [ -f sethdlc-new ]; then \
 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \