yet another header file installation location change... Zaptel headers are now installed into /usr/include/zaptel, not /usr/include

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1200 5390a7c7-147a-4af0-8ec9-7488f05a26cb

33 files changed, 62 insertions, 44 deletions

diff --git a/Makefile b/Makefile
index 067c73f..fe71a59 100644
--- a/Makefile
+++ b/Makefile
@@ -39,9 +39,9 @@ ifneq (,$(findstring ppc,$(UNAME_M)))
 CFLAGS_PPC:=-fsigned-char
 endif
 ifneq (,$(findstring x86_64,$(UNAME_M)))
-CFLAGS_X86-64:=-m64
+CFLAGS_x86_64:=-m64
 endif
-CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
+CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_x86_64)
 LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
 KFLAGS=-I$(KINCLUDES) -O6
 KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \
@@ -153,14 +153,18 @@ obj-m:=$(MODULESO)
 wct4xxp-objs:=wct4xxp_base.o vpm450m.o
 
 # Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
-# for i386. On other archs the module will probably build but panic.
-# This line is only meaningful when this Makefile is used as kconfig for 
+# for i386 or x86_64. On other archs the module will probably build but panic.
+# These lines are only meaningful when this Makefile is used as kconfig for 
 # 2.6 build
 
 ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && [ "x$(BUILD_XPP)" = "xyes" ] && echo 1))
 obj-m+=xpp/
 endif
 
+ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'x86_64' ] && [ "x$(BUILD_XPP)" = "xyes" ] && echo 1))
+obj-m+=xpp/
+endif
+
 BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool
 UTILS:=$(filter-out zttool fxstest ztcfg,$(BINS))
 UTILSO:=$(UTILS:%=%.o)
@@ -386,11 +390,13 @@ endif
 	$(LN) -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
 	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
-	$(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel.h
+	$(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel/zaptel.h
+	$(INSTALL) -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/zaptel/tonezone.h
 	rm -f $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
 	rm -f $(INSTALL_PREFIX)/usr/include/linux/torisa.h
+	rm -f $(INSTALL_PREFIX)/usr/include/zaptel.h
 	rm -f $(INSTALL_PREFIX)/usr/include/torisa.h
-	$(INSTALL) -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
+	rm -f $(INSTALL_PREFIX)/usr/include/tonezone.h
 	$(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) || :
diff --git a/fxotune.c b/fxotune.c
index 9664ea5..7e0d4eb 100644
--- a/fxotune.c
+++ b/fxotune.c
@@ -26,7 +26,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 #include "wctdm.h"
 #include "fxotune.h"
diff --git a/fxsdump.c b/fxsdump.c
index 1b51d36..c6265f0 100644
--- a/fxsdump.c
+++ b/fxsdump.c
@@ -11,7 +11,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 #include "coeffs.h"
diff --git a/hdlcstress.c b/hdlcstress.c
index 4a3ebf5..b27e7dc 100644
--- a/hdlcstress.c
+++ b/hdlcstress.c
@@ -2,7 +2,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
-#include <zaptel.h>
+#include "zaptel.h"
 #include <stdio.h>
 #include <linux/types.h>
 #include <linux/ppp_defs.h> 
diff --git a/hdlctest.c b/hdlctest.c
index 65305dd..abebbe6 100644
--- a/hdlctest.c
+++ b/hdlctest.c
@@ -2,7 +2,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
-#include <zaptel.h>
+#include "zaptel.h"
 #include <stdio.h>
 #include <linux/types.h>
 #include <linux/ppp_defs.h> 
diff --git a/patgen.c b/patgen.c
index 78e4b9f..f3f1769 100644
--- a/patgen.c
+++ b/patgen.c
@@ -13,7 +13,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 /* #define BLOCK_SIZE 2048 */
diff --git a/patlooptest.c b/patlooptest.c
index d938a07..655d387 100644
--- a/patlooptest.c
+++ b/patlooptest.c
@@ -13,7 +13,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 #define BLOCK_SIZE 2039
diff --git a/pattest.c b/pattest.c
index a7df5f8..d7b6fca 100644
--- a/pattest.c
+++ b/pattest.c
@@ -13,7 +13,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 #define BLOCK_SIZE 2039
diff --git a/pciradio.c b/pciradio.c
index f84ca8b..bf6dc9c 100644
--- a/pciradio.c
+++ b/pciradio.c
@@ -56,7 +56,7 @@ With driver:	303826  (1.5 %)
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 #define RAD_MAX_IFACES 128
diff --git a/timertest.c b/timertest.c
index 6e2f78c..10d9d66 100644
--- a/timertest.c
+++ b/timertest.c
@@ -11,7 +11,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 int main(int argc, char *argv[])
diff --git a/tor2.c b/tor2.c
index ef7c504..a610511 100644
--- a/tor2.c
+++ b/tor2.c
@@ -37,7 +37,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/torisa.c b/torisa.c
index cea8f3e..e969cba 100644
--- a/torisa.c
+++ b/torisa.c
@@ -32,7 +32,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/wcfxo.c b/wcfxo.c
index 0b95fa3..a78174b 100644
--- a/wcfxo.c
+++ b/wcfxo.c
@@ -35,7 +35,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/wcfxsusb.c b/wcfxsusb.c
index 68e9fda..71e90a0 100644
--- a/wcfxsusb.c
+++ b/wcfxsusb.c
@@ -45,10 +45,9 @@
 #endif
 
 #ifdef STANDALONE_ZAPATA
-
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif /* STANDALONE_ZAPATA */
 
 #include "wcfxsusb.h"
diff --git a/wct1xxp.c b/wct1xxp.c
index e4cd5d4..40d7de2 100644
--- a/wct1xxp.c
+++ b/wct1xxp.c
@@ -37,7 +37,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/wct4xxp_base.c b/wct4xxp_base.c
index 5015754..18be765 100644
--- a/wct4xxp_base.c
+++ b/wct4xxp_base.c
@@ -38,7 +38,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/wctdm.c b/wctdm.c
index 5f5b90c..3a57806 100644
--- a/wctdm.c
+++ b/wctdm.c
@@ -204,7 +204,7 @@ static struct fxo_mode {
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 #ifdef LINUX26
diff --git a/wctdm24xxp.c b/wctdm24xxp.c
index 358e84c..0d01117 100644
--- a/wctdm24xxp.c
+++ b/wctdm24xxp.c
@@ -231,7 +231,7 @@ static struct fxo_mode {
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 #ifdef LINUX26
diff --git a/wcte11xp.c b/wcte11xp.c
index b1fac74..cfd8180 100644
--- a/wcte11xp.c
+++ b/wcte11xp.c
@@ -37,7 +37,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/wcusb.c b/wcusb.c
index 6d1443e..4465068 100644
--- a/wcusb.c
+++ b/wcusb.c
@@ -45,10 +45,9 @@
 #endif
 
 #ifdef STANDALONE_ZAPATA
-
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif /* STANDALONE_ZAPATA */
 
 #include "wcusb.h"
diff --git a/xpp/xpp_zap.c b/xpp/xpp_zap.c
index 9a9ab0a..4c8d3e9 100644
--- a/xpp/xpp_zap.c
+++ b/xpp/xpp_zap.c
@@ -38,7 +38,13 @@
 #include <linux/delay.h>	/* for udelay */
 #include <linux/workqueue.h>
 #include <linux/proc_fs.h>
-#include <zaptel.h>
+
+#ifdef STANDALONE_ZAPATA
+#include "zaptel.h"
+#else
+#include <zaptel/zaptel.h>
+#endif
+
 #include <version.h>		/* For zaptel version */
 #include "xbus-core.h"
 #include "xproto.h"
diff --git a/xpp/zap_debug.c b/xpp/zap_debug.c
index 59eb0a8..8134e8f 100644
--- a/xpp/zap_debug.c
+++ b/xpp/zap_debug.c
@@ -28,7 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/module.h>
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #include "zap_debug.h"
 
 static const char rcsid[] = "$Id$";
diff --git a/zaptel.c b/zaptel.c
index 1a0c479..1c484d9 100644
--- a/zaptel.c
+++ b/zaptel.c
@@ -82,7 +82,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 #ifdef LINUX26
diff --git a/ztcfg-dude.c b/ztcfg-dude.c
index decbe2b..d96dd88 100644
--- a/ztcfg-dude.c
+++ b/ztcfg-dude.c
@@ -38,9 +38,12 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <math.h>
-#include "ztcfg.h"
-#include "tonezone.h"
+#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
+#else
+#include <zaptel/zaptel.h>
+#endif
+#include "ztcfg.h"
 
 #define NUM_SPANS ZT_MAX_SPANS
 
diff --git a/ztcfg.c b/ztcfg.c
index 230ec8d..9815a25 100644
--- a/ztcfg.c
+++ b/ztcfg.c
@@ -37,9 +37,14 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "ztcfg.h"
-#include "tonezone.h"
+#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
+#include "tonezone.h"
+#else
+#include <zaptel/zaptel.h>
+#include <zaptel/tonezone.h>
+#endif
+#include "ztcfg.h"
 
 #define NUM_SPANS ZT_MAX_SPANS
 
diff --git a/ztd-eth.c b/ztd-eth.c
index 132ae3b..c1b06f2 100644
--- a/ztd-eth.c
+++ b/ztd-eth.c
@@ -39,7 +39,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 #define ETH_P_ZTDETH	0xd00d
diff --git a/ztd-loc.c b/ztd-loc.c
index 2d720f0..6486a2a 100644
--- a/ztd-loc.c
+++ b/ztd-loc.c
@@ -63,7 +63,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 #ifdef DEFINE_SPINLOCK
diff --git a/ztdiag.c b/ztdiag.c
index f09cfb1..1472760 100644
--- a/ztdiag.c
+++ b/ztdiag.c
@@ -7,7 +7,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 
 int main(int argc, char *argv[])
diff --git a/ztdummy.c b/ztdummy.c
index ea6794b..766ab51 100644
--- a/ztdummy.c
+++ b/ztdummy.c
@@ -62,7 +62,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 #ifndef LINUX26
 #include <linux/usb.h>
diff --git a/ztdynamic.c b/ztdynamic.c
index 3a2fd90..8950f9c 100644
--- a/ztdynamic.c
+++ b/ztdynamic.c
@@ -39,7 +39,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
diff --git a/ztmonitor.c b/ztmonitor.c
index 05581d7..4e519e8 100644
--- a/ztmonitor.c
+++ b/ztmonitor.c
@@ -42,8 +42,8 @@
 #include "zaptel.h"
 #include "tonezone.h"
 #else
-#include <zaptel.h>
-#include <tonezone.h>
+#include <zaptel/zaptel.h>
+#include <zaptel/tonezone.h>
 #endif
 #include <linux/soundcard.h>
 
diff --git a/zttool.c b/zttool.c
index 3ec8b41..abb674d 100644
--- a/zttool.c
+++ b/zttool.c
@@ -42,8 +42,8 @@
 #include "zaptel.h"
 #include "tonezone.h"
 #else
-#include <zaptel.h>
-#include <tonezone.h>
+#include <zaptel/zaptel.h>
+#include <zaptel/tonezone.h>
 #endif
 
 static int ctl = -1;
diff --git a/zttranscode.c b/zttranscode.c
index ba7cba0..08fac66 100644
--- a/zttranscode.c
+++ b/zttranscode.c
@@ -40,7 +40,7 @@
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>