[zaptel-commits] tzafrir: branch 1.2 r2252 - /branches/1.2/xpp/utils/Makefile

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Wed Feb 28 14:57:52 2007
New Revision: 2252

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2252
Log:
Make the xpp/utils/Makefile in 1.2 closer to the one in 1.4 
(and actually work, this tine).

Modified:
    branches/1.2/xpp/utils/Makefile

Modified: branches/1.2/xpp/utils/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/utils/Makefile?view=diff&rev=2252&r1=2251&r2=2252
==============================================================================
--- branches/1.2/xpp/utils/Makefile (original)
+++ branches/1.2/xpp/utils/Makefile Wed Feb 28 14:57:52 2007
@@ -4,10 +4,24 @@
 INSTALL		= install
 INSTALL_DATA	= install -m 644
 
-SBINDIR    = /usr/sbin
-DATADIR   = /usr/share/zaptel
-MANDIR    = /usr/share/man/man8
-HOTPLUG_USB_DIR = /etc/hotplug/usb
+ZAPTEL_DIR	?= ../..
+
+-include $(ZAPTEL_DIR)/makeopts
+
+INSTALL_DATA	= $(INSTALL) -m 644
+
+# In 1.4 those are provided by autoconf through makeopts
+prefix		?= /usr
+datadir		?= $(prefix)/share
+mandir		?= $(datadir)/man
+INSTALL		?= install
+
+INSTALL_DATA	= $(INSTALL) -m 644
+
+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")
@@ -19,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