aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-08-12 12:46:47 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-08-12 12:46:47 +0000
commit9a049babb7da3e9cd1f7aa260f4ba0241148a092 (patch)
tree366903638c69dc9b9becac7a49619c7a11c30ad7
parentcf1698c6370d6a64f5f70a2dc5652d1fbc62afc3 (diff)
downloadupstream-9a049babb7da3e9cd1f7aa260f4ba0241148a092.tar.gz
upstream-9a049babb7da3e9cd1f7aa260f4ba0241148a092.tar.bz2
upstream-9a049babb7da3e9cd1f7aa260f4ba0241148a092.zip
tools/ppl: fix automake error due to use of obsolete directory name
I recently experienced this: configure.ac:1101: the top level interfaces/Prolog/Ciao/Makefile.am:168: `pkglibdir' is not a legitimate directory for `DATA' interfaces/Prolog/GNU/Makefile.am:167: `pkglibdir' is not a legitimate directory for `DATA' interfaces/Prolog/SICStus/Makefile.am:71: `pkglibdir' is not a legitimate directory for `DATA' interfaces/Prolog/SWI/Makefile.am:187: `pkglibdir' is not a legitimate directory for `DATA' interfaces/Prolog/XSB/Makefile.am:186: `pkglibdir' is not a legitimate directory for `DATA' interfaces/Prolog/YAP/Makefile.am:176: `pkglibdir' is not a legitimate directory for `DATA' make[4]: *** [Makefile.in] Error 1 Found this on google: http://bugs.mysql.com/bug.php?id=63898 And used this to fix it: fgrep -rlZ pkglib_DATA --include Makefile.am . | xargs -0 sed -i 's/pkglib_DATA/pkgdata_DATA/g' Signed-off-by: Daniel Golle <dgolle@allnet.de> SVN-Revision: 33141
-rw-r--r--tools/ppl/patches/002-replace-pkglib_DATA.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/tools/ppl/patches/002-replace-pkglib_DATA.patch b/tools/ppl/patches/002-replace-pkglib_DATA.patch
new file mode 100644
index 0000000000..c3dfe076c1
--- /dev/null
+++ b/tools/ppl/patches/002-replace-pkglib_DATA.patch
@@ -0,0 +1,75 @@
+--- a/interfaces/Prolog/Ciao/Makefile.am
++++ b/interfaces/Prolog/Ciao/Makefile.am
+@@ -165,7 +165,7 @@ $(NO_UNDEFINED_FLAG) \
+ -module \
+ -avoid-version
+
+-pkglib_DATA = ppl_ciao.po
++pkgdata_DATA = ppl_ciao.po
+
+ ppl_ciao.pl: $(interface_generator_dependencies)
+ $(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \
+--- a/interfaces/Prolog/GNU/Makefile.am
++++ b/interfaces/Prolog/GNU/Makefile.am
+@@ -164,7 +164,7 @@ ppl_gprolog.pl: $(interface_generator_de
+ $(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \
+ $(srcdir)/ppl_interface_generator_gprolog_pl.m4 > $@
+
+-pkglib_DATA = ppl_gprolog.pl
++pkgdata_DATA = ppl_gprolog.pl
+
+ bin_PROGRAMS = ppl_gprolog
+
+--- a/interfaces/Prolog/SICStus/Makefile.am
++++ b/interfaces/Prolog/SICStus/Makefile.am
+@@ -68,7 +68,7 @@ ppl_sicstus_SOURCES =
+
+ if ENABLE_SHARED
+
+-pkglib_DATA = ppl_sicstus.pl ppl_sicstus.s.o
++pkgdata_DATA = ppl_sicstus.pl ppl_sicstus.s.o
+
+ ppl_sicstus.so: ppl_sicstus.pl $(top_builddir)/src/libppl.la $(WATCHDOG_LIBRARY) libppl_sicstus.la
+ $(LIBTOOL) --mode=link --tag=CXX \
+@@ -86,7 +86,7 @@ install-data-local: ppl_sicstus.so
+
+ else !ENABLE_SHARED
+
+-pkglib_DATA = ppl_sicstus.pl
++pkgdata_DATA = ppl_sicstus.pl
+
+ endif !ENABLE_SHARED
+
+--- a/interfaces/Prolog/SWI/Makefile.am
++++ b/interfaces/Prolog/SWI/Makefile.am
+@@ -184,7 +184,7 @@ $(NO_UNDEFINED_FLAG) \
+ bin_PROGRAMS = ppl_pl
+ ppl_pl_SOURCES = ppl_pl.cc
+
+-pkglib_DATA = ppl_swiprolog.pl
++pkgdata_DATA = ppl_swiprolog.pl
+
+ CLPQ_TESTS_NONSTRICT = \
+ ack.clpq \
+--- a/interfaces/Prolog/XSB/Makefile.am
++++ b/interfaces/Prolog/XSB/Makefile.am
+@@ -183,7 +183,7 @@ $(NO_UNDEFINED_FLAG) \
+ -module \
+ -avoid-version
+
+-pkglib_DATA = ppl_xsb.xwam
++pkgdata_DATA = ppl_xsb.xwam
+
+ ppl_xsb.xwam: ppl_xsb.H ppl_xsb.cc libppl_xsb.la
+ cp -f ppl_xsb.cc ppl_xsb.c
+--- a/interfaces/Prolog/YAP/Makefile.am
++++ b/interfaces/Prolog/YAP/Makefile.am
+@@ -173,7 +173,7 @@ $(NO_UNDEFINED_FLAG) \
+ -module \
+ -avoid-version
+
+-pkglib_DATA = ppl_yap.pl
++pkgdata_DATA = ppl_yap.pl
+
+ CLPQ_TESTS_NONSTRICT = \
+ ack.clpq \