automake: xpp: handle /usr/share/dahdi
authorOron Peled <oron.peled@xorcom.com>
Mon, 18 May 2015 15:49:08 +0000 (15:49 +0000)
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>
Tue, 19 May 2015 16:54:11 +0000 (19:54 +0300)
Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

xpp/Makefile.am
xpp/Makefile.legacy

index 3dacac2..1645a78 100644 (file)
@@ -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
 
index 3dc3f89..2095c25 100644 (file)
@@ -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: