patches/ppl/0.11.1/300-fix-data-dir.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Jun 25 23:33:01 2014 +0200 (2014-06-25)
changeset 3325 069f43a215cc
permissions -rw-r--r--
all: fix wildcard to work with make-4.x

In make-3.8x, the $(wildacrd) function would sort the entries,
while in make-4.x, it would just return the entries in any
unpredictable order [*]

Use the $(sort) function to get reproducible behaviour.

[*] Well, most probably the roder the entries appear when read
from readdir()

Reported-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
     1 commit 10e0afa8fa25c9e0e8eaac9a0d730ab325086010
     2 Author: Roberto Bagnara <bagnara@cs.unipr.it>
     3 Date:   Sun Feb 12 08:48:59 2012 +0100
     4 
     5     Prolog sources must go under .../share/ppl as these files are architecture independent.
     6     Moreover, new versions of Automake no longer accept pkglib_DATA.
     7 
     8 diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am
     9 index c8dd56e..8dcf17e 100644
    10 --- a/interfaces/Prolog/Ciao/Makefile.am
    11 +++ b/interfaces/Prolog/Ciao/Makefile.am
    12 @@ -170,7 +170,7 @@ $(NO_UNDEFINED_FLAG) \
    13  -module \
    14  -avoid-version
    15  
    16 -pkglib_DATA = ppl_ciao.po
    17 +pkgdata_DATA = ppl_ciao.po
    18  
    19  ppl_ciao.pl: $(interface_generator_dependencies)
    20  	$(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \
    21 diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am
    22 index 5904bf1..2ba45ee 100644
    23 --- a/interfaces/Prolog/GNU/Makefile.am
    24 +++ b/interfaces/Prolog/GNU/Makefile.am
    25 @@ -169,7 +169,7 @@ ppl_gprolog.pl: $(interface_generator_dependencies)
    26  	$(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \
    27             $(srcdir)/ppl_interface_generator_gprolog_pl.m4 > $@
    28  
    29 -pkglib_DATA = ppl_gprolog.pl
    30 +pkgdata_DATA = ppl_gprolog.pl
    31  
    32  bin_PROGRAMS = ppl_gprolog
    33  
    34 diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am
    35 index 17a54c7..22f809f 100644
    36 --- a/interfaces/Prolog/SICStus/Makefile.am
    37 +++ b/interfaces/Prolog/SICStus/Makefile.am
    38 @@ -69,7 +69,7 @@ ppl_sicstus_SOURCES =
    39  
    40  if ENABLE_SHARED
    41  
    42 -pkglib_DATA = ppl_sicstus.pl ppl_sicstus.s.o
    43 +pkgdata_DATA = ppl_sicstus.pl ppl_sicstus.s.o
    44  
    45  ppl_sicstus.so: ppl_sicstus.pl $(top_builddir)/src/libppl.la $(WATCHDOG_LIBRARY) libppl_sicstus.la
    46  	$(LIBTOOL) --mode=link --tag=CXX \
    47 @@ -87,7 +87,7 @@ install-data-local: ppl_sicstus.so
    48  
    49  else !ENABLE_SHARED
    50  
    51 -pkglib_DATA = ppl_sicstus.pl
    52 +pkgdata_DATA = ppl_sicstus.pl
    53  
    54  endif !ENABLE_SHARED
    55  
    56 diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am
    57 index f5bcbe8..5e4e0e4 100644
    58 --- a/interfaces/Prolog/SWI/Makefile.am
    59 +++ b/interfaces/Prolog/SWI/Makefile.am
    60 @@ -189,7 +189,7 @@ $(NO_UNDEFINED_FLAG) \
    61  bin_PROGRAMS = ppl_pl
    62  ppl_pl_SOURCES = ppl_pl.cc
    63  
    64 -pkglib_DATA = ppl_swiprolog.pl
    65 +pkgdata_DATA = ppl_swiprolog.pl
    66  
    67  CLPQ_TESTS_NONSTRICT = \
    68  ack.clpq \
    69 diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am
    70 index 18648eb..1bc1e67 100644
    71 --- a/interfaces/Prolog/XSB/Makefile.am
    72 +++ b/interfaces/Prolog/XSB/Makefile.am
    73 @@ -188,7 +188,7 @@ $(NO_UNDEFINED_FLAG) \
    74  -module \
    75  -avoid-version
    76  
    77 -pkglib_DATA = ppl_xsb.xwam
    78 +pkgdata_DATA = ppl_xsb.xwam
    79  
    80  ppl_xsb.xwam: ppl_xsb.H ppl_xsb.cc libppl_xsb.la
    81  	cp -f ppl_xsb.cc ppl_xsb.c
    82 diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am
    83 index fab59c2..34d89e9 100644
    84 --- a/interfaces/Prolog/YAP/Makefile.am
    85 +++ b/interfaces/Prolog/YAP/Makefile.am
    86 @@ -179,7 +179,7 @@ $(NO_UNDEFINED_FLAG) \
    87  -module \
    88  -avoid-version
    89  
    90 -pkglib_DATA = ppl_yap.pl
    91 +pkgdata_DATA = ppl_yap.pl
    92  
    93  CLPQ_TESTS_NONSTRICT = \
    94  ack.clpq \