summaryrefslogtreecommitdiff
path: root/xpp/utils
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-02-28 20:57:52 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-02-28 20:57:52 +0000
commit52ffdaf30030940ac760970c4badc98936400661 (patch)
treec6f17ebf20b9cdddc23214022f80372b17a13a7f /xpp/utils
parent0a3be34270e02db587d49751e4e90bb210833869 (diff)
Make the xpp/utils/Makefile in 1.2 closer to the one in 1.4
(and actually work, this tine). git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2252 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/utils')
-rw-r--r--xpp/utils/Makefile23
1 files changed, 18 insertions, 5 deletions
diff --git a/xpp/utils/Makefile b/xpp/utils/Makefile
index e902cbd..a49818b 100644
--- a/xpp/utils/Makefile
+++ b/xpp/utils/Makefile
@@ -4,10 +4,24 @@ RANLIB = ranlib
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 @@ XPD_INIT = $(wildcard ../init_card_?_*) ../calibrate_slics
# 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