summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-01-31 16:15:51 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-01-31 16:15:51 +0000
commit5fc9ea8c390bfaa38730f920c4696a501c222679 (patch)
treeca3be1bb39294b6bbeac0568e20c9777aa6abf42
parent651c73d0db4b21fe4b4120f9211c6243e15f9118 (diff)
downloadmultiarch-utils-5fc9ea8c390bfaa38730f920c4696a501c222679.tar
multiarch-utils-5fc9ea8c390bfaa38730f920c4696a501c222679.tar.gz
multiarch-utils-5fc9ea8c390bfaa38730f920c4696a501c222679.tar.bz2
multiarch-utils-5fc9ea8c390bfaa38730f920c4696a501c222679.tar.xz
multiarch-utils-5fc9ea8c390bfaa38730f920c4696a501c222679.zip
add multiarch_{platform,x11bindir,x11includedir}
-rw-r--r--macros.multiarch7
1 files changed, 5 insertions, 2 deletions
diff --git a/macros.multiarch b/macros.multiarch
index 9ceaac1..45fc69e 100644
--- a/macros.multiarch
+++ b/macros.multiarch
@@ -1,5 +1,8 @@
-%multiarch_bindir %{_bindir}/multiarch-%{_arch}-%{_target_os}
-%multiarch_includedir %{_includedir}/multiarch-%{_arch}-%{_target_os}
+%multiarch_platform multiarch-%{_arch}-%{_target_os}
+%multiarch_bindir %{_bindir}/%{multiarch_platform}
+%multiarch_includedir %{_includedir}/%{multiarch_platform}
+%multiarch_x11bindir %{_prefix}/X11R6/bin/%{multiarch_platform}
+%multiarch_x11includedir %{_prefix}/X11R6/include/%{multiarch_platform}
%multiarch_distro 1020