From dd86b54e6e03a0682eb8ed41006ffdfd837ffae0 Mon Sep 17 00:00:00 2001 From: zwelch Date: Wed, 27 May 2009 07:49:58 +0000 Subject: Update build system to find moved scripts -- Step 3 of 2: - Update references from using PKGLIBDIR to PKGDATADIR. - Update built-in script search paths to reflect new install location: - $(pkgdatadir) => $(pktdatadir)/site - $(pkglibdir) => $(pktdatadir)/scripts - Update installed location of httpd files: - $(pkglibdir)/httpd => $(pkgdatadir)/httpd git-svn-id: svn://svn.berlios.de/openocd/trunk@1920 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/server/Makefile.am | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/server/Makefile.am') diff --git a/src/server/Makefile.am b/src/server/Makefile.am index 2a723a6b..17e067d2 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/target \ -I$(top_srcdir)/src/flash \ -I$(top_srcdir)/src/jtag \ - -DPKGLIBDIR=\"$(pkglibdir)\" + -DPKGDATADIR=\"$(pkgdatadir)\" METASOURCES = AUTO noinst_LTLIBRARIES = libserver.la @@ -25,7 +25,12 @@ noinst_HEADERS += tcl_server.h libserver_la_SOURCES += tcl_server.c if HTTPD -nobase_dist_pkglib_DATA = $(wildcard $(srcdir)/httpd/*.tcl $(srcdir)/httpd/*.css $(srcdir)/httpd/menu_cuts/*.png) +nobase_dist_pkgdata_DATA = \ + $(wildcard \ + $(srcdir)/httpd/*.tcl \ + $(srcdir)/httpd/*.css \ + $(srcdir)/httpd/menu_cuts/*.png \ + ) endif EXTRA_DIST = \ -- cgit v1.2.3