Skip to content

Instantly share code, notes, and snippets.

@manphiz
Created March 12, 2014 13:11
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save manphiz/9506614 to your computer and use it in GitHub Desktop.
Save manphiz/9506614 to your computer and use it in GitHub Desktop.
diff -urN ppl-0.11.orig/Watchdog/configure.ac ppl-0.11/Watchdog/configure.ac
--- ppl-0.11.orig/Watchdog/configure.ac 2010-08-02 13:21:24.000000000 -0700
+++ ppl-0.11/Watchdog/configure.ac 2014-03-12 05:16:08.000000000 -0700
@@ -39,7 +39,7 @@
AC_CANONICAL_HOST
# Use Automake.
-AM_INIT_AUTOMAKE([foreign no-define dist-bzip2 dist-zip dist-lzma silent-rules 1.11])
+AM_INIT_AUTOMAKE([foreign no-define dist-bzip2 dist-zip silent-rules 1.11])
AC_SUBST(VERSION)
# Generate a configuration header file.
diff -urN ppl-0.11.orig/configure.ac ppl-0.11/configure.ac
--- ppl-0.11.orig/configure.ac 2010-08-02 13:21:25.000000000 -0700
+++ ppl-0.11/configure.ac 2014-03-12 05:15:51.000000000 -0700
@@ -39,7 +39,7 @@
AC_CANONICAL_HOST
# Use Automake.
-AM_INIT_AUTOMAKE([foreign no-define dist-bzip2 dist-zip dist-lzma tar-ustar silent-rules 1.11])
+AM_INIT_AUTOMAKE([foreign no-define dist-bzip2 dist-zip tar-ustar silent-rules 1.11])
AC_SUBST(VERSION)
diff -urN ppl-0.11.orig/interfaces/Java/Makefile.am ppl-0.11/interfaces/Java/Makefile.am
--- ppl-0.11.orig/interfaces/Java/Makefile.am 2010-08-02 13:21:24.000000000 -0700
+++ ppl-0.11/interfaces/Java/Makefile.am 2014-03-12 05:25:54.000000000 -0700
@@ -33,7 +33,7 @@
../ppl_interface_generator_common_procedure_generators.m4 \
ppl_interface_generator_java_procedure_generators.m4
-jardir = $(pkglibdir)
+jardir = $(pkgdatadir)
jar_DATA = ppl_java.jar
ppl_java.jar: parma_polyhedra_library/java_classes.stamp
diff -urN ppl-0.11.orig/interfaces/OCaml/Makefile.am ppl-0.11/interfaces/OCaml/Makefile.am
--- ppl-0.11.orig/interfaces/OCaml/Makefile.am 2010-08-02 13:21:24.000000000 -0700
+++ ppl-0.11/interfaces/OCaml/Makefile.am 2014-03-12 05:25:54.000000000 -0700
@@ -43,7 +43,7 @@
OCaml_interface.dox \
README.ocaml
-ocamldir = $(pkglibdir)
+ocamldir = $(pkgdatadir)
if HAVE_OCAMLC
diff -urN ppl-0.11.orig/interfaces/Prolog/Ciao/Makefile.am ppl-0.11/interfaces/Prolog/Ciao/Makefile.am
--- ppl-0.11.orig/interfaces/Prolog/Ciao/Makefile.am 2010-08-02 13:21:24.000000000 -0700
+++ ppl-0.11/interfaces/Prolog/Ciao/Makefile.am 2014-03-12 05:26:59.000000000 -0700
@@ -169,7 +169,7 @@
-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)/../.. \
diff -urN ppl-0.11.orig/interfaces/Prolog/GNU/Makefile.am ppl-0.11/interfaces/Prolog/GNU/Makefile.am
--- ppl-0.11.orig/interfaces/Prolog/GNU/Makefile.am 2010-08-02 13:21:24.000000000 -0700
+++ ppl-0.11/interfaces/Prolog/GNU/Makefile.am 2014-03-12 05:26:59.000000000 -0700
@@ -168,7 +168,7 @@
$(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
diff -urN ppl-0.11.orig/interfaces/Prolog/SICStus/Makefile.am ppl-0.11/interfaces/Prolog/SICStus/Makefile.am
--- ppl-0.11.orig/interfaces/Prolog/SICStus/Makefile.am 2010-08-02 13:21:24.000000000 -0700
+++ ppl-0.11/interfaces/Prolog/SICStus/Makefile.am 2014-03-12 05:26:59.000000000 -0700
@@ -68,7 +68,7 @@
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 \
@@ -82,11 +82,11 @@
install-data-local: ppl_sicstus.so
$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) \
- $< $(DESTDIR)$(pkglibdir)/$<
+ $< $(DESTDIR)$(pkgdatadir)/$<
else !ENABLE_SHARED
-pkglib_DATA = ppl_sicstus.pl
+pkgdata_DATA = ppl_sicstus.pl
endif !ENABLE_SHARED
diff -urN ppl-0.11.orig/interfaces/Prolog/SWI/Makefile.am ppl-0.11/interfaces/Prolog/SWI/Makefile.am
--- ppl-0.11.orig/interfaces/Prolog/SWI/Makefile.am 2010-08-02 13:21:24.000000000 -0700
+++ ppl-0.11/interfaces/Prolog/SWI/Makefile.am 2014-03-12 05:26:59.000000000 -0700
@@ -188,7 +188,7 @@
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 \
diff -urN ppl-0.11.orig/interfaces/Prolog/XSB/Makefile.am ppl-0.11/interfaces/Prolog/XSB/Makefile.am
--- ppl-0.11.orig/interfaces/Prolog/XSB/Makefile.am 2010-08-02 13:21:24.000000000 -0700
+++ ppl-0.11/interfaces/Prolog/XSB/Makefile.am 2014-03-12 05:26:59.000000000 -0700
@@ -187,7 +187,7 @@
-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
diff -urN ppl-0.11.orig/interfaces/Prolog/YAP/Makefile.am ppl-0.11/interfaces/Prolog/YAP/Makefile.am
--- ppl-0.11.orig/interfaces/Prolog/YAP/Makefile.am 2010-08-02 13:21:24.000000000 -0700
+++ ppl-0.11/interfaces/Prolog/YAP/Makefile.am 2014-03-12 05:26:59.000000000 -0700
@@ -178,7 +178,7 @@
-module \
-avoid-version
-pkglib_DATA = ppl_yap.pl
+pkgdata_DATA = ppl_yap.pl
CLPQ_TESTS_NONSTRICT = \
ack.clpq \
diff -urN ppl-0.11.orig/m4/ac_cxx_flexible_arrays.m4 ppl-0.11/m4/ac_cxx_flexible_arrays.m4
--- ppl-0.11.orig/m4/ac_cxx_flexible_arrays.m4 2010-08-02 13:21:24.000000000 -0700
+++ ppl-0.11/m4/ac_cxx_flexible_arrays.m4 2014-03-12 05:15:30.000000000 -0700
@@ -40,6 +40,8 @@
A()
: i(0), b(false) {
}
+
+ ~A() {}
};
class B {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment