Meson: Add $ORIGIN/../lib to all RPATHs

Need both lib and lib64

1 files changed, 17 insertions, 17 deletions

diff --git a/meson.build b/meson.build
index 1c749d0d..ffdcb4db 100644
--- a/meson.build
+++ b/meson.build
@@ -103,49 +103,49 @@ executable('cell_tool',
            ['src/cell_tool.c', versionc],
            dependencies : [mdep, libcrystfeldep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # partial_sim
 executable('partial_sim',
            ['src/partial_sim.c', versionc],
            dependencies : [mdep, libcrystfeldep, gsldep, pthreaddep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # process_hkl
 process_hkl = executable('process_hkl',
                          ['src/process_hkl.c', versionc],
                          dependencies : [mdep, libcrystfeldep],
                          install : true,
-                         install_rpath: '$ORIGIN/../lib64/')
+                         install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # list_events
 executable('list_events',
            ['src/list_events.c', versionc],
            dependencies : [mdep, libcrystfeldep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # get_hkl
 executable('get_hkl',
            ['src/get_hkl.c', versionc],
            dependencies : [mdep, libcrystfeldep, gsldep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # compare_hkl
 executable('compare_hkl',
            ['src/compare_hkl.c', versionc],
            dependencies : [mdep, libcrystfeldep, gsldep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # check_hkl
 executable('check_hkl',
            ['src/check_hkl.c', versionc],
            dependencies : [mdep, libcrystfeldep, gsldep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # partialator
 partialator = executable('partialator',
@@ -157,21 +157,21 @@ partialator = executable('partialator',
                           versionc],
                          dependencies : [mdep, libcrystfeldep, gsldep, pthreaddep],
                          install : true,
-                         install_rpath: '$ORIGIN/../lib64/')
+                         install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # ambigator
 executable('ambigator',
            ['src/ambigator.c', versionc],
            dependencies : [mdep, libcrystfeldep, gsldep, hdf5dep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # whirligig
 executable('whirligig',
            ['src/whirligig.c', versionc],
            dependencies : [mdep, libcrystfeldep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # indexamajig
 indexamajig_sources = ['src/indexamajig.c', 'src/im-sandbox.c',
@@ -185,14 +185,14 @@ executable('indexamajig', indexamajig_sources,
            dependencies : [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep,
                            msgpackdep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # make_pixelmap
 executable('make_pixelmap',
            ['src/make_pixelmap.c', versionc],
            dependencies : [mdep, libcrystfeldep, hdf5dep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # geoptimiser
 # FIXME: restore
@@ -200,7 +200,7 @@ executable('make_pixelmap',
 #           ['src/geoptimiser.c', 'src/hdfsee-render.c', versionc],
 #           dependencies : [mdep, libcrystfeldep, gsldep, gdkpixbufdep, gdkdep],
 #          install : true,
-#          install_rpath: '$ORIGIN/../lib64/')
+#          install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # CrystFEL GUI
 if gtkdep.found()
@@ -221,7 +221,7 @@ if gtkdep.found()
   executable('crystfel', gui_sources,
              dependencies : [mdep, libcrystfeldep, gtkdep, gsldep, slurmdep],
              install : true,
-             install_rpath: '$ORIGIN/../lib64/')
+             install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 endif
 
@@ -230,7 +230,7 @@ executable('render_hkl',
            ['src/render_hkl.c', versionc],
            dependencies : [mdep, libcrystfeldep, cairodep, gsldep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 
 # cell_explorer
 if gtkdep.found()
@@ -238,7 +238,7 @@ if gtkdep.found()
              ['src/cell_explorer.c', 'src/multihistogram.c', versionc],
              dependencies : [mdep, libcrystfeldep, gtkdep, gsldep],
              install : true,
-             install_rpath: '$ORIGIN/../lib64/')
+             install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 endif
 
 # pattern_sim
@@ -249,7 +249,7 @@ endif
 executable('pattern_sim', pattern_sim_sources,
            dependencies : [mdep, libcrystfeldep, gsldep, hdf5dep, opencldep],
            install : true,
-           install_rpath: '$ORIGIN/../lib64/')
+           install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
 # For testing (see tests/meson.build)
 simulation_bits = files(['src/diffraction.c', 'src/diffraction-gpu.c', 'src/cl-utils.c'])