|
|
5339e55 |
diff -up ./install.sh.src.orig ./install.sh.src
|
|
|
5339e55 |
--- ./install.sh.src.orig 2015-09-02 14:39:32.011146045 +1000
|
|
|
5339e55 |
+++ ./install.sh.src 2015-09-02 14:40:31.756148173 +1000
|
|
|
5339e55 |
@@ -76,7 +76,7 @@ install -d "$DESTDIR${PREFIX_SHARE}/bash
|
|
|
0017287 |
install -d "$DESTDIR${PREFIX_SHARE}/fish/completions"
|
|
|
0017287 |
install -d "$DESTDIR${PREFIX_SHARE}/doc/0install"
|
|
|
0017287 |
install -d "$DESTDIR${PREFIX}/${ZSHFUNCTIONS}"
|
|
|
0017287 |
-install -d "$DESTDIR${PREFIX}/lib/0install.net"
|
|
|
0017287 |
+install -d "$DESTDIR${PREFIX}/lib64/0install.net"
|
|
|
0017287 |
|
|
|
0017287 |
install -m 0644 ${DOCS} "$DESTDIR${PREFIX_SHARE}/doc/0install/"
|
|
|
0017287 |
install -m 0644 ${MANPAGES} "$DESTDIR${PREFIX_MAN}/man1/"
|
|
|
5339e55 |
@@ -93,7 +93,7 @@ install -m 0755 share/0install.net/unlzm
|
|
|
0017287 |
install -m 0755 share/0install.net/unxz "$DESTDIR${PREFIX_SHARE}/0install.net/"
|
|
|
0017287 |
|
|
|
5339e55 |
if [ -n "$PLUGINS" ]; then
|
|
|
5339e55 |
- install -m 0644 $PLUGINS "$DESTDIR${PREFIX}/lib/0install.net/"
|
|
|
5339e55 |
+ install -m 0644 $PLUGINS "$DESTDIR${PREFIX}/lib64/0install.net/"
|
|
|
0017287 |
fi
|
|
|
0017287 |
|
|
|
0017287 |
for size in 24x24 48x48 128x128 scalable; do \
|
|
|
5339e55 |
diff -up ./ocaml/Makefile.orig ./ocaml/Makefile
|
|
|
5339e55 |
diff -up ./ocaml/zeroinstall/gui.ml.orig ./ocaml/zeroinstall/gui.ml
|
|
|
5339e55 |
--- ./ocaml/zeroinstall/gui.ml.orig 2015-09-02 14:32:01.260129993 +1000
|
|
|
5339e55 |
+++ ./ocaml/zeroinstall/gui.ml 2015-09-02 14:34:51.351136051 +1000
|
|
|
5339e55 |
@@ -337,7 +337,7 @@ let try_get_gui config ~use_gui =
|
|
|
5339e55 |
if system#file_exists plugin_path then Some plugin_path else None in
|
|
|
5339e55 |
|
|
|
5339e55 |
let plugin_path =
|
|
|
5339e55 |
- let sys_lib = Filename.dirname bindir +/ "lib" in
|
|
|
5339e55 |
+ let sys_lib = Filename.dirname bindir +/ "lib64" in
|
|
|
5339e55 |
U.first_match check_plugin_dir [
|
|
|
5339e55 |
(* Was 0install installed with opam? *)
|
|
|
5339e55 |
sys_lib +/ "0install";
|