summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--multiarch-dispatch-host.def24
2 files changed, 28 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ef3c4bf..94b9c30 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,9 @@ RPM_MACRO_FILES = macros.multiarch
RPM_BIN_FILES = mkmultiarch check-multiarch-files
BINARIES = multiarch-platform multiarch-dispatch
INCLUDES = multiarch-dispatch.h
+XCONFIGS = multiarch-dispatch-host.def
OTHER_FILES = Makefile multiarch-utils.spec ChangeLog
-FILES = $(RPM_MACRO_FILES) $(RPM_BIN_FILES) $(BINARIES) $(INCLUDES) $(OTHER_FILES)
+FILES = $(RPM_MACRO_FILES) $(RPM_BIN_FILES) $(BINARIES) $(INCLUDES) $(XCONFIGS) $(OTHER_FILES)
PACKAGE = multiarch-utils
VERSION := $(shell rpm -q --qf %{VERSION} --specfile $(PACKAGE).spec)
@@ -39,6 +40,8 @@ install:
install -m755 $(BINARIES) $(DESTDIR)$(bindir)/
-mkdir -p $(DESTDIR)$(includedir)
install -m644 $(INCLUDES) $(DESTDIR)$(includedir)/
+ -mkdir -p $(DESTDIR)$(prefix)/X11R6/lib/X11/config
+ install -m644 $(XCONFIGS) $(DESTDIR)$(prefix)/X11R6/lib/X11/config/
# rules to build a test rpm
diff --git a/multiarch-dispatch-host.def b/multiarch-dispatch-host.def
new file mode 100644
index 0000000..2cd1340
--- /dev/null
+++ b/multiarch-dispatch-host.def
@@ -0,0 +1,24 @@
+/* Dispatch arch dependent configuration */
+#if defined(AMD64Architecture) || defined(x86_64Architecture)
+#include "host-x86_64.def"
+#elif defined(i386Architecture)
+#include "host-i386.def"
+#elif defined(Ppc64Architecture)
+#include "host-ppc64.def"
+#elif defined(PpcArchitecture)
+#include "host-ppc.def"
+#elif defined(Sparc64Architecture)
+#include "host-sparc64.def"
+#elif defined(SparcArchitecture)
+#include "host-sparc.def"
+#elif defined(s390xArchitecture)
+#include "host-s390x.def"
+#elif defined(s390Architecture)
+#include "host-s390.def"
+#elif defined(ia64Architecture)
+#include "host-ia64.def"
+#elif defined(AlphaArchitecture)
+#include "host-alpha.def"
+#else
+#error "Unknown architecture, please submit bug report"
+#endif