[Astlinux-commits] SF.net SVN: astlinux: [668] trunk/package/zaptel

[<dha...@us...>]

Revision: 668
          http://svn.sourceforge.net/astlinux/?rev=668&view=rev
Author:   dhartman
Date:     2007-02-26 10:34:29 -0800 (Mon, 26 Feb 2007)

Log Message:
-----------
zaptel fix for zttool

Modified Paths:
--------------
    trunk/package/zaptel/zaptel-makefile0.patch
    trunk/package/zaptel/zaptel.mk

Modified: trunk/package/zaptel/zaptel-makefile0.patch
===================================================================
--- trunk/package/zaptel/zaptel-makefile0.patch	2007-02-26 18:16:04 UTC (rev 667)
+++ trunk/package/zaptel/zaptel-makefile0.patch	2007-02-26 18:34:29 UTC (rev 668)
@@ -1,6 +1,5 @@
-diff -ur zaptel-1.2.13.orig/Makefile zaptel-1.2.13/Makefile
---- zaptel-1.2.13.orig/Makefile	2007-02-05 16:54:40.000000000 -0500
-+++ zaptel-1.2.13/Makefile	2007-02-14 16:17:34.000000000 -0500
+--- zaptel/Makefile.orig	2007-02-26 10:34:21.000000000 -0600
++++ zaptel/Makefile	2007-02-26 10:35:28.000000000 -0600
 @@ -6,6 +6,7 @@
  #
  
@@ -9,7 +8,16 @@
  
  ifeq ($(MAKELEVEL),0)
  PWD:=$(shell pwd)
-@@ -224,13 +225,13 @@
+@@ -141,7 +142,7 @@ LIBTONEZONE_SO_MINOR_VER:=0
+ MOD_DESTDIR:=zaptel
+ 
+ BINS=ztcfg torisatool makefw ztmonitor ztspeed zttest fxotune
+-ifneq (,$(wildcard /usr/include/newt.h))
++ifneq (,$(wildcard ./newt.h))
+ BINS+=zttool
+ endif
+ 
+@@ -224,13 +225,13 @@ torisatool: torisatool.o
  	$(CC) -o $@ $^
  
  tones.h: gendigits
@@ -26,7 +34,7 @@
  
  gendigits: gendigits.o
  	$(CC) -o $@ $^ -lm
-@@ -344,13 +345,13 @@
+@@ -344,13 +345,13 @@ b410p:
  	$(MAKE) -C mISDNuser install
  
  install: all devices firmware
@@ -44,7 +52,7 @@
  ifeq ($(BUILDVER),linux26)
  	for x in $(MODULESKO); do \
  		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/extra/$$x ; \
-@@ -366,25 +367,18 @@
+@@ -366,25 +367,18 @@ endif
  		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.o; \
  	fi; \
  	rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o

Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk	2007-02-26 18:16:04 UTC (rev 667)
+++ trunk/package/zaptel/zaptel.mk	2007-02-26 18:34:29 UTC (rev 668)
@@ -64,6 +64,7 @@
 $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY): $(ZAPTEL_DIR)/$(ZAPTEL_BINARY)
 	mkdir -p $(STAGING_DIR)/etc/udev/rules.d #hack to get install to work...
 	mkdir -p $(STAGING_DIR)/share/man/man8 #yet another hack...
+	cp $(STAGING_DIR)/include/newt.h $(ZAPTEL_DIR)/. #hack to get zttool to compile
 	mkdir -p $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc
 	$(MAKE) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) ARCH=$(ZAPTEL_TARGET_ARCH) \
 	KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) $(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.