From 4cc7df1089128cc7f6b727c92526156c94208c8a Mon Sep 17 00:00:00 2001 From: Oron Peled Date: Mon, 18 May 2015 15:49:08 +0000 Subject: [PATCH] automake: xpp: handle /usr/share/dahdi Signed-off-by: Tzafrir Cohen --- xpp/Makefile.am | 2 ++ xpp/Makefile.legacy | 18 ------------------ 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/xpp/Makefile.am b/xpp/Makefile.am index 3dacac2..1645a78 100644 --- a/xpp/Makefile.am +++ b/xpp/Makefile.am @@ -55,6 +55,8 @@ perl_mans = $(perl_scripts:%=%.8) endif +pkgdatadir = @datadir@/dahdi +pkgdata_SCRIPTS = xpp_fxloader astribank_hook waitfor_xpds udevrulesdir = @udevrulesdir@ udevrules_DATA = xpp.rules diff --git a/xpp/Makefile.legacy b/xpp/Makefile.legacy index 3dc3f89..2095c25 100644 --- a/xpp/Makefile.legacy +++ b/xpp/Makefile.legacy @@ -1,8 +1,5 @@ PEDANTIC = -ansi -pedantic -std=c99 -INSTALL = install -INSTALL_DATA = install -m 644 - # # Ugly hack to find kernel directories before/after the split # to kernel/user-space. @@ -14,18 +11,6 @@ DAHDI_KERNELDIR = -include $(DAHDI_TOOLSDIR)/makeopts -INSTALL_DATA = $(INSTALL) -m 644 - -# In 1.4 those are provided by autoconf through makeopts -prefix ?= /usr -datadir ?= $(prefix)/share -sysconfdir ?= $(prefix)/etc -INSTALL ?= install - -INSTALL_DATA = $(INSTALL) -m 644 - -DATADIR = $(datadir)/dahdi - # Variables that should be defined above, but need sane defaults: # FIXME: Are those values really sane? HOSTCC ?= $(CC) @@ -33,8 +18,5 @@ HOSTCC ?= $(CC) all: install: all - $(INSTALL) -d $(DESTDIR)$(DATADIR) - $(INSTALL) xpp_fxloader astribank_hook $(DESTDIR)$(DATADIR)/ - $(INSTALL) waitfor_xpds $(DESTDIR)$(DATADIR)/ clean: