Update of /cvsroot/leaf/src/bering-uclibc/contrib/zaptel
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10104
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
zaptel-install_prefix.patch
Log Message:
Fix path to zaptel.conf
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/zaptel/buildtool.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildtool.cfg 25 Sep 2006 15:09:37 -0000 1.1
--- buildtool.cfg 6 Oct 2006 12:06:05 -0000 1.2
***************
*** 33,36 ****
--- 33,43 ----
</File>
+ <File zaptel-install_prefix.patch>
+ Server = cvs-contrib-sourceforge
+ Directory = zaptel
+ Revision = HEAD
+ envname = ZAPTEL_PATCH4
+ </File>
+
<File zaptel.init>
Server = cvs-contrib-sourceforge
***************
*** 43,47 ****
<zaptel>
Version = 1.2.9.1
! Revision = 1
Help <<EOF
--- 50,54 ----
<zaptel>
Version = 1.2.9.1
! Revision = 2
Help <<EOF
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/zaptel/buildtool.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildtool.mk 25 Sep 2006 15:09:37 -0000 1.1
--- buildtool.mk 6 Oct 2006 12:06:05 -0000 1.2
***************
*** 9,12 ****
--- 9,13 ----
cat $(ZAPTEL_PATCH2) | patch -d $(ZAPTEL_DIR) -p1
cat $(ZAPTEL_PATCH3) | patch -d $(ZAPTEL_DIR) -p1
+ cat $(ZAPTEL_PATCH4) | patch -d $(ZAPTEL_DIR) -p1
ln -s $(ZAPTEL_DIR) zaptel # for BRIstuff
touch $(ZAPTEL_DIR)/.source
--- NEW FILE: zaptel-install_prefix.patch ---
diff -ur zaptel-1.2.9.1.orig/Makefile zaptel-1.2.9.1/Makefile
--- zaptel-1.2.9.1.orig/Makefile 2006-09-09 01:49:43.000000000 +0200
+++ zaptel-1.2.9.1/Makefile 2006-10-06 13:57:00.550759415 +0200
@@ -50,7 +50,7 @@
ROOT_PREFIX=
INSTALL_PREFIX:=$(DESTDIR)
-CONFIG_FILE:=$(INSTALL_PREFIX)/etc/zaptel.conf
+CONFIG_FILE:=/etc/zaptel.conf
CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
@@ -351,7 +351,7 @@
install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- [ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample
$(CONFIG_FILE)
+ [ -f $(INSTALL_PREFIX)/$(CONFIG_FILE) ] || install -D -m 644
zaptel.conf.sample $(INSTALL_PREFIX)/$(CONFIG_FILE)
build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out
zaptel,$(MODULES))"
@if [ -d /etc/modutils ]; then \
/sbin/update-modules ; \
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
