summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2010-01-24 11:38:48 +0000
committerAnssi Hannula <anssi@mandriva.org>2010-01-24 11:38:48 +0000
commit54d926c906be3a82cc1b143e00d2ba6164758564 (patch)
tree55ce581c6f74b5d98dc6c7d499edea0bf3bd61c5
parent4b2b99bd92226d1de915d5ecd0c663affdba3ede (diff)
downloadmultiarch-utils-54d926c906be3a82cc1b143e00d2ba6164758564.tar
multiarch-utils-54d926c906be3a82cc1b143e00d2ba6164758564.tar.gz
multiarch-utils-54d926c906be3a82cc1b143e00d2ba6164758564.tar.bz2
multiarch-utils-54d926c906be3a82cc1b143e00d2ba6164758564.tar.xz
multiarch-utils-54d926c906be3a82cc1b143e00d2ba6164758564.zip
- remove dispatch file for host.def, it is no longer used
-rw-r--r--Makefile5
-rw-r--r--NEWS1
-rw-r--r--multiarch-dispatch-host.def24
3 files changed, 2 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index 93ca09f..1cd2b55 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,8 @@ RPM_MACRO_FILES = 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 NEWS
-FILES = $(foreach file,$(RPM_MACRO_FILES),macros.$(file)) $(RPM_BIN_FILES) $(BINARIES) $(INCLUDES) $(XCONFIGS) $(OTHER_FILES)
+FILES = $(foreach file,$(RPM_MACRO_FILES),macros.$(file)) $(RPM_BIN_FILES) $(BINARIES) $(INCLUDES) $(OTHER_FILES)
PACKAGE = multiarch-utils
VERSION = 1.0.9
@@ -43,8 +42,6 @@ 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/
localdist: cleandist dir localcopy changelog tar
diff --git a/NEWS b/NEWS
index e69de29..61ef3df 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1 @@
+- remove dispatch file for host.def, it is no longer used
diff --git a/multiarch-dispatch-host.def b/multiarch-dispatch-host.def
deleted file mode 100644
index 2cd1340..0000000
--- a/multiarch-dispatch-host.def
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 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