Rework installation logic so we can go outside the install prefix.

22 files changed, 50 insertions, 48 deletions

diff --git a/test cases/common/10 man install/installed_files.txt b/test cases/common/10 man install/installed_files.txt
index 6a86b928d..29331e412 100644
--- a/test cases/common/10 man install/installed_files.txt
+++ b/test cases/common/10 man install/installed_files.txt
@@ -1,3 +1,3 @@
-share/man/man1/foo.1.gz
-share/man/man2/bar.2.gz
-share/man/man1/vanishing.1.gz
+usr/share/man/man1/foo.1.gz
+usr/share/man/man2/bar.2.gz
+usr/share/man/man1/vanishing.1.gz
diff --git a/test cases/common/12 data/etcfile.dat b/test cases/common/12 data/etcfile.dat
new file mode 100644
index 000000000..93db8cb06
--- /dev/null
+++ b/test cases/common/12 data/etcfile.dat
@@ -0,0 +1 @@
+This goes into /etc/etcfile.dat
diff --git a/test cases/common/12 data/installed_files.txt b/test cases/common/12 data/installed_files.txt
index 8d7ff7073..1c58623f2 100644
--- a/test cases/common/12 data/installed_files.txt
+++ b/test cases/common/12 data/installed_files.txt
@@ -1,2 +1,3 @@
-share/progname/datafile.dat
-share/progname/vanishing.dat
+usr/share/progname/datafile.dat
+usr/share/progname/vanishing.dat
+etc/etcfile.dat
diff --git a/test cases/common/12 data/meson.build b/test cases/common/12 data/meson.build
index 850704624..5a04d6c42 100644
--- a/test cases/common/12 data/meson.build
+++ b/test cases/common/12 data/meson.build
@@ -1,3 +1,4 @@
 project('data install test', 'c')
 install_data('progname', sources : 'datafile.dat')
+install_data('dummy', sources : 'etcfile.dat', install_dir : '/etc')
 subdir('vanishing')
diff --git a/test cases/common/27 library versions/installed_files.txt b/test cases/common/27 library versions/installed_files.txt
index 9c9e1e080..a218d29eb 100644
--- a/test cases/common/27 library versions/installed_files.txt
+++ b/test cases/common/27 library versions/installed_files.txt
@@ -1,3 +1,3 @@
-lib/libsomelib.so
-lib/libsomelib.so.0
-lib/libsomelib.so.1.2.3
+usr/lib/libsomelib.so
+usr/lib/libsomelib.so.0
+usr/lib/libsomelib.so.1.2.3
diff --git a/test cases/common/46 library chain/installed_files.txt b/test cases/common/46 library chain/installed_files.txt
index cee40b777..8d38fd975 100644
--- a/test cases/common/46 library chain/installed_files.txt
+++ b/test cases/common/46 library chain/installed_files.txt
@@ -1,4 +1,4 @@
-bin/prog
-lib/liblib1.so
-lib/liblib2.so
-lib/liblib3.so
+usr/bin/prog
+usr/lib/liblib1.so
+usr/lib/liblib2.so
+usr/lib/liblib3.so
diff --git a/test cases/common/49 subproject/installed_files.txt b/test cases/common/49 subproject/installed_files.txt
index e4b1e3f10..55a859567 100644
--- a/test cases/common/49 subproject/installed_files.txt
+++ b/test cases/common/49 subproject/installed_files.txt
@@ -1,2 +1,2 @@
-bin/user
-lib/libsublib.so
+usr/bin/user
+usr/lib/libsublib.so
diff --git a/test cases/common/51 pkgconfig-gen/installed_files.txt b/test cases/common/51 pkgconfig-gen/installed_files.txt
index 547e53082..cc5d34ba3 100644
--- a/test cases/common/51 pkgconfig-gen/installed_files.txt
+++ b/test cases/common/51 pkgconfig-gen/installed_files.txt
@@ -1,3 +1,3 @@
-include/simple.h
-lib/libsimple.so
-lib/pkgconfig/simple.pc
+usr/include/simple.h
+usr/lib/libsimple.so
+usr/lib/pkgconfig/simple.pc
diff --git a/test cases/common/52 custom install dirs/installed_files.txt b/test cases/common/52 custom install dirs/installed_files.txt
index ad6ce3bac..dc495e2b7 100644
--- a/test cases/common/52 custom install dirs/installed_files.txt
+++ b/test cases/common/52 custom install dirs/installed_files.txt
@@ -1,4 +1,4 @@
-dib/dab/dub/prog
-some/dir/sample.h
-woman/prog.1.gz
-meow/datafile.cat
+usr/dib/dab/dub/prog
+usr/some/dir/sample.h
+usr/woman/prog.1.gz
+usr/meow/datafile.cat
diff --git a/test cases/common/56 custom target/installed_files.txt b/test cases/common/56 custom target/installed_files.txt
index 6baed145c..d90a6b01c 100644
--- a/test cases/common/56 custom target/installed_files.txt
+++ b/test cases/common/56 custom target/installed_files.txt
@@ -1 +1 @@
-subdir/data.dat
+usr/subdir/data.dat
diff --git a/test cases/common/57 custom target chain/installed_files.txt b/test cases/common/57 custom target chain/installed_files.txt
index c5f8bd766..4e326a213 100644
--- a/test cases/common/57 custom target chain/installed_files.txt
+++ b/test cases/common/57 custom target chain/installed_files.txt
@@ -1 +1 @@
-subdir/data2.dat
+usr/subdir/data2.dat
diff --git a/test cases/common/6 linkshared/installed_files.txt b/test cases/common/6 linkshared/installed_files.txt
index cabfd814b..2a4c33005 100644
--- a/test cases/common/6 linkshared/installed_files.txt
+++ b/test cases/common/6 linkshared/installed_files.txt
@@ -1,2 +1,2 @@
-bin/prog
-lib/libmylib.so
+usr/bin/prog
+usr/lib/libmylib.so
diff --git a/test cases/common/60 install script/installed_files.txt b/test cases/common/60 install script/installed_files.txt
index 13150a27e..58315f9f4 100644
--- a/test cases/common/60 install script/installed_files.txt
+++ b/test cases/common/60 install script/installed_files.txt
@@ -1,2 +1,2 @@
-bin/prog
-diiba/daaba/file.dat
+usr/bin/prog
+usr/diiba/daaba/file.dat
diff --git a/test cases/common/60 install script/myinstall.sh b/test cases/common/60 install script/myinstall.sh
index 725f639fd..4739dee0e 100755
--- a/test cases/common/60 install script/myinstall.sh
+++ b/test cases/common/60 install script/myinstall.sh
@@ -4,8 +4,7 @@ echo Starting custom installation step
 
 # These commands fail on Windows, but we don't really care.
 
-mkdir "${DESTDIR}/${MESON_INSTALL_PREFIX}/diiba"
-mkdir "${DESTDIR}/${MESON_INSTALL_PREFIX}/diiba/daaba"
-touch "${DESTDIR}/${MESON_INSTALL_PREFIX}/diiba/daaba/file.dat"
+mkdir -p "${DESTDIR}${MESON_INSTALL_PREFIX}/diiba/daaba"
+touch "${DESTDIR}${MESON_INSTALL_PREFIX}/diiba/daaba/file.dat"
 
 echo Finishing custom install step
diff --git a/test cases/common/66 install subdir/installed_files.txt b/test cases/common/66 install subdir/installed_files.txt
index 4f5bacff5..93ee28383 100644
--- a/test cases/common/66 install subdir/installed_files.txt
+++ b/test cases/common/66 install subdir/installed_files.txt
@@ -1,2 +1,2 @@
-share/sub1/data1.dat
-share/sub1/sub2/data2.dat
+usr/share/sub1/data1.dat
+usr/share/sub1/sub2/data2.dat
diff --git a/test cases/common/67 foreach/installed_files.txt b/test cases/common/67 foreach/installed_files.txt
index 805694876..36c638681 100644
--- a/test cases/common/67 foreach/installed_files.txt
+++ b/test cases/common/67 foreach/installed_files.txt
@@ -1,3 +1,3 @@
-bin/prog1
-bin/prog2
-bin/prog3
+usr/bin/prog1
+usr/bin/prog2
+usr/bin/prog3
diff --git a/test cases/common/8 install/installed_files.txt b/test cases/common/8 install/installed_files.txt
index fa8530b1c..1e9166b51 100644
--- a/test cases/common/8 install/installed_files.txt
+++ b/test cases/common/8 install/installed_files.txt
@@ -1,3 +1,3 @@
-bin/prog
-lib/libshar.so
-lib/libstat.a
+usr/bin/prog
+usr/lib/libshar.so
+usr/lib/libstat.a
diff --git a/test cases/common/9 header install/installed_files.txt b/test cases/common/9 header install/installed_files.txt
index 508aa3207..b9e91a286 100644
--- a/test cases/common/9 header install/installed_files.txt
+++ b/test cases/common/9 header install/installed_files.txt
@@ -1,3 +1,3 @@
-include/rootdir.h
-include/subdir/subdir.h
-include/vanished.h
+usr/include/rootdir.h
+usr/include/subdir/subdir.h
+usr/include/vanished.h
diff --git a/test cases/csharp/1 basic/installed_files.txt b/test cases/csharp/1 basic/installed_files.txt
index 3e9301715..f64c68c66 100644
--- a/test cases/csharp/1 basic/installed_files.txt
+++ b/test cases/csharp/1 basic/installed_files.txt
@@ -1 +1 @@
-bin/prog.exe
+usr/bin/prog.exe
diff --git a/test cases/csharp/2 library/installed_files.txt b/test cases/csharp/2 library/installed_files.txt
index 48d527751..b8306347e 100644
--- a/test cases/csharp/2 library/installed_files.txt
+++ b/test cases/csharp/2 library/installed_files.txt
@@ -1,2 +1,2 @@
-bin/prog.exe
-lib/libhelper.dll
+usr/bin/prog.exe
+usr/lib/libhelper.dll
diff --git a/test cases/frameworks/6 gettext/installed_files.txt b/test cases/frameworks/6 gettext/installed_files.txt
index 60a2b78ab..c95b9fde4 100644
--- a/test cases/frameworks/6 gettext/installed_files.txt
+++ b/test cases/frameworks/6 gettext/installed_files.txt
@@ -1,3 +1,3 @@
-bin/intlprog
-share/locale/de/LC_MESSAGES/intltest.mo
-share/locale/fi/LC_MESSAGES/intltest.mo
+usr/bin/intlprog
+usr/share/locale/de/LC_MESSAGES/intltest.mo
+usr/share/locale/fi/LC_MESSAGES/intltest.mo
diff --git a/test cases/frameworks/7 gir/installed_files.txt b/test cases/frameworks/7 gir/installed_files.txt
index 568324a0b..beb8cba31 100644
--- a/test cases/frameworks/7 gir/installed_files.txt
+++ b/test cases/frameworks/7 gir/installed_files.txt
@@ -1 +1 @@
-typelibdir/Meson-1.0.typelib
\ No newline at end of file
+usr/typelibdir/Meson-1.0.typelib
\ No newline at end of file