diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-28 21:05:12 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-28 21:05:12 +0000 |
| commit | e3cb51a11c4af4cb7b2de0af1d8a719a033a7356 (patch) | |
| tree | cf36879b446aacdf2ab157e9b3e3192a3cef72ef | |
| parent | c3364cb7d304c9bd83b633095cd88d7b8c08ea18 (diff) | |
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).
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2254 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | xpp/utils/Makefile | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/xpp/utils/Makefile b/xpp/utils/Makefile index d54848b..a49818b 100644 --- a/xpp/utils/Makefile +++ b/xpp/utils/Makefile @@ -4,16 +4,12 @@ RANLIB = ranlib 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 datadir ?= $(prefix)/share @@ -22,10 +18,10 @@ INSTALL ?= install 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 @@ 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 |