[svn-commits] tzafrir: branch 1.2 r2987 - in /branches/1.2: README ppp/ ppp/Makefile

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Fri Aug 31 01:54:20 2007
New Revision: 2987

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2987
Log:
* Maintain the same meaning of DESTDIR and INSTALL_PREFIX as in main
  Makefile
* Document ppp support to the best of my knowledge.
* Err clearly if the VERSION was not found.

Modified:
    branches/1.2/README
    branches/1.2/ppp/   (props changed)
    branches/1.2/ppp/Makefile

Modified: branches/1.2/README
URL: http://svn.digium.com/view/zaptel/branches/1.2/README?view=diff&rev=2987&r1=2986&r2=2987
==============================================================================
--- branches/1.2/README (original)
+++ branches/1.2/README Fri Aug 31 01:54:20 2007
@@ -374,6 +374,26 @@
 
            2 XPP_FXS/0/0/1 FXOLS (In use)
 
+[[ppp]]
+PPP Support
+-----------
+Zaptel digital cards can provide data channels through ppp as
+point-to-point connections. This requires a plugin to the ppp daemon
+that is included in the ppp/ subdirectory. To install it:
+
+1. Make sure you have the PPP source / headers installed. On Debian:
+
+   apt-get install ppp-dev
+
+2. Run 'make' on the ppp subdirectory:
+
+   make -C ppp 
+   make -C ppp install
+
+3. Make sure your kernel has support for both PPP (which is common is
+   distribution kernels and for HDLC (much less common) - CONFIG_PPP and
+   CONFIG_HDLC .
+
 
 What is the license for the zaptel driver?
 ------------------------------------------
@@ -383,8 +403,7 @@
 
 If you wish to use the zaptel drivers in an application for which the 
 GPL is not appropriate (e.g. a proprietary embedded system), licenses
-under more flexible terms can be readily obtained through Digium, Inc. 
-at reasonable cost.
+under more flexible terms can be readily obtained through Digium, Inc.at reasonable cost.
 
 
 How do I report bugs or contribute?

Propchange: branches/1.2/ppp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 31 01:54:20 2007
@@ -1,0 +1,1 @@
+zaptel.so

Modified: branches/1.2/ppp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/ppp/Makefile?view=diff&rev=2987&r1=2986&r2=2987
==============================================================================
--- branches/1.2/ppp/Makefile (original)
+++ branches/1.2/ppp/Makefile Fri Aug 31 01:54:20 2007
@@ -4,22 +4,27 @@
 LDFLAGS	= -shared
 INSTALL	= install
 
-DESTDIR = /usr
+INSTALL_PREFIX	= /usr
+INCLUDE_DIR	= $(INSTALL_PREFIX)/include/pppd
 
-VERSION := $(shell awk -F '"' '/VERSION/ { print $$2; }' $(DESTDIR)/include/pppd/patchlevel.h)
-
-LIBDIR := $(DESTDIR)/lib/pppd/$(VERSION)
+VERSION		:= $(shell awk -F '"' '/VERSION/ { print $$2; }' $(INCLUDE_DIR)/patchlevel.h)
+LIBDIR		= $(INSTALL_PREFIX)/lib/pppd/$(VERSION)
 
 PLUGINS := zaptel.so
 
 all:	$(PLUGINS)
 
 %.so: %.c
+ifeq (,$(VERSION))
+	@echo "pppd version not found (in patchlevel.h)."
+	@echo "Install ppp source/headers and/or point INCLUDE_DIR to them."
+	exit 1
+endif
 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
 
 install: $(PLUGINS)
-	$(INSTALL) -d $(LIBDIR)
-	$(INSTALL) -m 0644 $? $(LIBDIR)
+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -m 0644 $? $(DESTDIR)$(LIBDIR)
 
 clean:
 	rm -f *.o *.so *.a