Update build system to find moved scripts -- Step 3 of 2:

[fw/openocd] / src / server / Makefile.am

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 2a723a6bdcc2db047b40c515ef6204e97ca4e726..17e067d2e2e40708f98bb0e61a51d667775e9fdb 100644 (file)
--- 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 = \