[zaptel-commits] tzafrir: trunk r2254 - in /trunk: ./ xpp/utils/Makefile

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Wed Feb 28 15:05:12 2007
New Revision: 2254

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2254
Log:
r2252 | tzafrir | 2007-02-28 22:57:52 +0200 (Wed, 28 Feb 2007) | 3 lines

Make the xpp/utils/Makefile in 1.2 closer to the one in 1.4 
(and actually work, this tine).

Modified:
    trunk/   (props changed)
    trunk/xpp/utils/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/xpp/utils/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/xpp/utils/Makefile?view=diff&rev=2254&r1=2253&r2=2254
==============================================================================
--- trunk/xpp/utils/Makefile (original)
+++ trunk/xpp/utils/Makefile Wed Feb 28 15:05:12 2007
@@ -4,15 +4,11 @@
 INSTALL		= install
 INSTALL_DATA	= install -m 644
 
-TOPDIR		?= ../..
+ZAPTEL_DIR	?= ../..
 
--include $(TOPDIR)/makeopts
+-include $(ZAPTEL_DIR)/makeopts
 
 INSTALL_DATA	= $(INSTALL) -m 644
-
-BINDIR    = $(prefix)/sbin
-DATADIR   = $(datadir)/zaptel
-MANDIR    = $(mandir)/man8
 
 # In 1.4 those are provided by autoconf through makeopts
 prefix		?= /usr
@@ -22,10 +18,10 @@
 
 INSTALL_DATA	= $(INSTALL) -m 644
 
-BINDIR   = $(prefix)/sbin
-DATADIR   = $(datadir)/zaptel
-MANDIR    = $(mandir)/man8
-HOTPLUG_USB_DIR = /etc/hotplug/usb
+SBINDIR		= $(prefix)/sbin
+DATADIR		= $(datadir)/zaptel
+MANDIR		= $(mandir)/man8
+HOTPLUG_USB_DIR	= /etc/hotplug/usb
 UDEV_RULES_DIR	= /etc/udev/rules.d
 # Perl disabled by default, until we see it is safe:
 #PERLLIBDIR	= $(shell eval `perl -V:sitelib`; echo "$$sitelib")
@@ -37,7 +33,6 @@
 # Variables that should be defined above, but need sane defaults:
 # FIXME: Are those values really sane?
 HOSTCC		?= $(CC)
-ZAPTEL_DIR	?= ../..
 
 ifeq	(,$(PBX_LIBUSB))
 # No PBX_LIBUSB? Maybe we compile against zaptel-1.2