There's no need to define "etherealconfdir" - we can just use

"pkgdatadir".

svn path=/trunk/; revision=7366
This commit is contained in:
Guy Harris 2003-03-25 23:33:38 +00:00
parent 1ca0a752aa
commit a0753c2fd7
1 changed files with 5 additions and 6 deletions

View File

@ -1,7 +1,7 @@
# Makefile.am # Makefile.am
# Automake file for Ethereal # Automake file for Ethereal
# #
# $Id: Makefile.am,v 1.570 2003/03/25 22:30:19 guy Exp $ # $Id: Makefile.am,v 1.571 2003/03/25 23:33:38 guy Exp $
# #
# Ethereal - Network traffic analyzer # Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com> # By Gerald Combs <gerald@ethereal.com>
@ -69,17 +69,16 @@ EXTRA_PROGRAMS = ethereal tethereal editcap mergecap dftest text2pcap
EXTRA_SCRIPTS = idl2eth EXTRA_SCRIPTS = idl2eth
# #
# Directory for Ethereal configuration files. Currently contains # Ethereal configuration files are put in $(pkgdatadir). It currently
# "manuf" file and diamter directory. # contains the "manuf" file and a "diameter" directory.
# #
etherealconfdir = $(prefix)/share/ethereal pkgdata_DATA = manuf
etherealconf_DATA = manuf
# #
# Install the Diameter DTD and XML files in the "diameter" subdirectory # Install the Diameter DTD and XML files in the "diameter" subdirectory
# of that directory. # of that directory.
# #
diameterdir = $(etherealconfdir)/diameter diameterdir = $(pkgdatadir)/diameter
diameter_DATA = dictionary.dtd dictionary.xml mobileipv4.xml \ diameter_DATA = dictionary.dtd dictionary.xml mobileipv4.xml \
nasreq.xml sunping.xml nasreq.xml sunping.xml