From 38eb7b43d346fa5a7259c9f6c01c771928e9ce3b Mon Sep 17 00:00:00 2001 From: Liang Chang Date: Wed, 15 Dec 2021 00:21:08 +0800 Subject: [PATCH] DtMmdb: install spec files to datadir. --- cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am | 3 +++ cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am | 5 +++-- cde/programs/dtinfo/DtMmdb/oliasdb/mmdb.infolib.spec | 4 ++-- cde/programs/dtinfo/DtMmdb/schema/store_desc.C | 6 +++--- cde/programs/dtinfo/DtMmdb/schema/token.ll | 4 ++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am b/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am index 372ad1aa2..c658a775b 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am @@ -1,5 +1,8 @@ MAINTAINERCLEANFILES = Makefile.in +specdir = $(pkgdatadir)/DtMmdb +spec_DATA = hardcopy.feature.spec online.feature.spec + noinst_LTLIBRARIES = libStyleSheet.la libStyleSheet_la_CXXFLAGS = -DEXPAND_TEMPLATES -DCDE_NEXT -I.. diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am index 79d283c06..bbb830a94 100644 --- a/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am +++ b/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am @@ -1,7 +1,8 @@ -infolibdir = ${prefix}/infolib - MAINTAINERCLEANFILES = Makefile.in +specdir = $(pkgdatadir)/DtMmdb +spec_DATA = mmdb.infolib.spec + noinst_LTLIBRARIES = liboliasdb.la liboliasdb_la_CXXFLAGS = -DNO_DB_LOCK -I.. diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mmdb.infolib.spec b/cde/programs/dtinfo/DtMmdb/oliasdb/mmdb.infolib.spec index a90d584cb..06b713fc7 100644 --- a/cde/programs/dtinfo/DtMmdb/oliasdb/mmdb.infolib.spec +++ b/cde/programs/dtinfo/DtMmdb/oliasdb/mmdb.infolib.spec @@ -30,14 +30,14 @@ store page_store: cached_pages=50: nm=$.dbd: mode=r: - byte_order=big_endian + endianness=big_endian store page_store: page_sz=8192: cached_pages=50: nm=$.dbi: mode=r: - byte_order=big_endian + endianness=big_endian inv inv: nm=$.node.inv:store_nm=$.dbi inv inv: nm=$.graphic.inv:store_nm=$.dbi diff --git a/cde/programs/dtinfo/DtMmdb/schema/store_desc.C b/cde/programs/dtinfo/DtMmdb/schema/store_desc.C index 909099a1f..ff3785250 100644 --- a/cde/programs/dtinfo/DtMmdb/schema/store_desc.C +++ b/cde/programs/dtinfo/DtMmdb/schema/store_desc.C @@ -169,11 +169,11 @@ ostream& store_desc::asciiOut(ostream& out, Boolean last) desc::asciiOut(out, false); char* mode = mode_str; desc_print(out, mode); - char* byte_order = order_str; + char* endianness = order_str; if ( last == true ) - desc_print_end(out, byte_order); + desc_print_end(out, endianness); else - desc_print(out, byte_order); + desc_print(out, endianness); if ( ! out ) throw(stringException("store_desc::asciiOut() failed")); diff --git a/cde/programs/dtinfo/DtMmdb/schema/token.ll b/cde/programs/dtinfo/DtMmdb/schema/token.ll index 89e319f36..e89438cf2 100644 --- a/cde/programs/dtinfo/DtMmdb/schema/token.ll +++ b/cde/programs/dtinfo/DtMmdb/schema/token.ll @@ -149,8 +149,8 @@ int linecount = 1; return(PAGE_SZ); } -"byte_order" { - return(BYTE_ORDER); +"endianness" { + return(ENDIANNESS); } "cached_pages" {