|
 |
97a5e19 |
From 335e238a611c3c9796e14e1bff968ea519703f7c Mon Sep 17 00:00:00 2001
|
|
|
3463be2 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
3463be2 |
Date: Tue, 10 Aug 2010 14:01:55 +0200
|
|
|
3463be2 |
Subject: [PATCH] Move AuErrorDB to SHAREDIR
|
|
|
3463be2 |
|
|
|
3463be2 |
AuErrorDB list of error messages. Non-executables should not reside in LIBDIR.
|
|
|
3463be2 |
---
|
|
|
3463be2 |
README | 2 +-
|
|
|
3463be2 |
lib/audio/AuErrDes.c | 2 +-
|
|
|
3463be2 |
lib/audio/Imakefile | 6 +++---
|
|
|
3463be2 |
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
3463be2 |
|
|
|
3463be2 |
diff --git a/README b/README
|
|
|
3463be2 |
index 790bc58..0d852c0 100644
|
|
|
3463be2 |
--- a/README
|
|
|
3463be2 |
+++ b/README
|
|
|
3463be2 |
@@ -175,7 +175,7 @@ A complete installation should include the following files:
|
|
|
3463be2 |
/usr/man/man3/*.3 API man pages
|
|
|
3463be2 |
|
|
|
3463be2 |
/usr/lib/libaudio.[a|so] API library
|
|
|
3463be2 |
- /usr/lib/X11/AuErrorDB Error database
|
|
|
3463be2 |
+ /usr/share/X11/AuErrorDB Error database
|
|
|
3463be2 |
|
|
|
3463be2 |
/usr/bin/X11/nasd NAS server for your
|
|
|
3463be2 |
hardware (voxware,
|
|
|
3463be2 |
diff --git a/lib/audio/AuErrDes.c b/lib/audio/AuErrDes.c
|
|
|
3463be2 |
index 157423a..f5e8ea7 100644
|
|
|
3463be2 |
--- a/lib/audio/AuErrDes.c
|
|
|
3463be2 |
+++ b/lib/audio/AuErrDes.c
|
|
|
3463be2 |
@@ -23,7 +23,7 @@
|
|
|
3463be2 |
*/
|
|
|
3463be2 |
|
|
|
3463be2 |
#ifndef ERRORDB
|
|
|
3463be2 |
-#define ERRORDB "/usr/lib/X11/AuErrorDB"
|
|
|
3463be2 |
+#define ERRORDB "/usr/share/X11/AuErrorDB"
|
|
|
3463be2 |
#endif /* !ERRORDB */
|
|
|
3463be2 |
|
|
|
3463be2 |
#include "Alibint.h"
|
|
|
3463be2 |
diff --git a/lib/audio/Imakefile b/lib/audio/Imakefile
|
|
|
97a5e19 |
index db73732..2f2e740 100644
|
|
|
3463be2 |
--- a/lib/audio/Imakefile
|
|
|
3463be2 |
+++ b/lib/audio/Imakefile
|
|
|
3463be2 |
@@ -79,7 +79,7 @@ XCOMM JET - see if we should avoid streams
|
|
|
3463be2 |
COMPAT_OBJS = AuGetBest.o
|
|
|
3463be2 |
#endif /* ProjectX < 5 */
|
|
|
3463be2 |
|
|
|
3463be2 |
- EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
|
|
|
3463be2 |
+ EDB_DEFINES = -DERRORDB=\"$(SHAREDIR)/AuErrorDB\"
|
|
|
3463be2 |
|
|
|
3463be2 |
DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
|
|
|
3463be2 |
CONN_DEFINES = ConnectionFlags
|
|
|
3463be2 |
@@ -137,11 +137,11 @@ SpecialObjectRule(globals.o,/**/,$(CONN_DEFINES))
|
|
|
3463be2 |
BuildIncludes($(HEADERS),audio,..)
|
|
|
3463be2 |
InstallMultiple($(HEADERS),$(INCDIR))
|
|
|
3463be2 |
#if ProjectX >= 5
|
|
|
3463be2 |
-InstallNonExecFile(AuErrorDB,$(LIBDIR))
|
|
|
3463be2 |
+InstallNonExecFile(AuErrorDB,$(SHAREDIR))
|
|
|
3463be2 |
#else
|
|
|
3463be2 |
install::
|
|
|
3463be2 |
$(MKDIRHIER) $(LIBDIR)
|
|
|
3463be2 |
-InstallNonExec(AuErrorDB,$(LIBDIR))
|
|
|
3463be2 |
+InstallNonExec(AuErrorDB,$(SHAREDIR))
|
|
|
3463be2 |
#endif
|
|
|
3463be2 |
|
|
|
97a5e19 |
#if defined(HPArchitecture) && !defined(LinuxArchitecture) && !defined(GNUArchitecture) && !defined(DarwinArchitecture)
|
|
|
3463be2 |
--
|
|
|
97a5e19 |
1.7.6.1
|
|
|
3463be2 |
|