From 9b5b547a343cd63acc393b8a5d54320b83a794de Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 27 Jul 2014 13:44:35 -0600 Subject: [PATCH] Fixup UDB databases to fix a problem introduced with FreeBSD 10 patch. The symbol hp-ux is used to tag files for installation on HP machines in the UDB databases. To ensure the correct release streams are defined, these symbols (hp-ux, linux, freebsd, etc) are undef'd so that they are not evaluated in the context of db file generation by the preprocessor. A change in the FreeBSD 10 patch disabled this, possibly due to 'hp-ux' being an invalid cpp symbol on FreeBSD 10 machines, which now use clang by default. Undefining these cpp symbols is actually required, otherwise linux, for example, is defined as a '1' in the generated databases, which will not match the release stream name 'linux', therefore all of the files tagged as 'linux' are never installed. To fix this, revert the change made in the FreeBSD 10 patch, and rename all occurances of 'hp-ux' to 'hpux' in the UDB files to avoid the potential for cpp trouble when hp-ux is specified. As a result of this change, 'hpux' is now the name of the release stream for hp machines, not 'hp-ux'. --- cde/databases/:CheckEdit.sh | 2 +- cde/databases/CDE-DEMOS.udb | 8 +- cde/databases/CDE-FONTS.udb | 86 ++++++++--------- cde/databases/CDE-HELP-LOC.src | 26 +++--- cde/databases/CDE-HELP-PRG.udb | 8 +- cde/databases/CDE-HELP-RUN.udb | 10 +- cde/databases/CDE-ICONS.udb | 8 +- cde/databases/CDE-INC.udb | 6 +- cde/databases/CDE-INFO.udb | 8 +- cde/databases/CDE-INFOLIB-LOC.src | 14 +-- cde/databases/CDE-LOC.src | 150 +++++++++++++++--------------- cde/databases/CDE-MAN-DEV.udb | 10 +- cde/databases/CDE-MAN.udb | 12 +-- cde/databases/CDE-MIN.udb | 8 +- cde/databases/CDE-MSG-LOC.src | 24 ++--- cde/databases/CDE-PRG.udb | 8 +- cde/databases/CDE-RUN.udb | 20 ++-- cde/databases/CDE-SHLIBS.src | 54 +++++------ cde/databases/CDE-TT.udb | 8 +- cde/databases/Imakefile | 10 +- 20 files changed, 237 insertions(+), 243 deletions(-) diff --git a/cde/databases/:CheckEdit.sh b/cde/databases/:CheckEdit.sh index 69d80b482..bb690a03b 100755 --- a/cde/databases/:CheckEdit.sh +++ b/cde/databases/:CheckEdit.sh @@ -13,6 +13,6 @@ /x/toolsrc/dbTools/databaseConversionTool.ksh \ -toFileList \ - -ReleaseStream hp-ux \ + -ReleaseStream hpux \ -Machine 7 \ -Database $1 diff --git a/cde/databases/CDE-DEMOS.udb b/cde/databases/CDE-DEMOS.udb index 0d030c02a..bb70d4e1e 100644 --- a/cde/databases/CDE-DEMOS.udb +++ b/cde/databases/CDE-DEMOS.udb @@ -5,10 +5,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-DEMOS type = file @@ -26,7 +26,7 @@ responsible_project = cde_dt } #>>------------------------------ -# Defaults for: hp-ux 10.0 +# Defaults for: hpux 10.0 #<<------------------------------ # { hpV4 : defaults @@ -147,7 +147,7 @@ group = bin } #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults diff --git a/cde/databases/CDE-FONTS.udb b/cde/databases/CDE-FONTS.udb index 79fce1577..05f43e6fd 100644 --- a/cde/databases/CDE-FONTS.udb +++ b/cde/databases/CDE-FONTS.udb @@ -4,10 +4,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-FONTS type = file @@ -191,7 +191,7 @@ group = bin } #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults @@ -255,184 +255,184 @@ programs/fontaliases/linux/ja_JP/fonts.dir # for HP/UX 9 # programs/fontaliases/hp/C/fonts.alias -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/fonts.alias } # programs/fontaliases/hp/C/fonts.dir -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/fonts.dir } # programs/fontaliases/hp/C/dtinfo.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/dtinfo.pcf } # programs/fontaliases/hp/C/sys13.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/sys13.pcf } # programs/fontaliases/hp/C/sys14.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/sys14.pcf } # programs/fontaliases/hp/C/sys16.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/sys16.pcf } # programs/fontaliases/hp/C/sys17.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/sys17.pcf } # programs/fontaliases/hp/C/sys19.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/sys19.pcf } # programs/fontaliases/hp/C/sys23.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/sys23.pcf } # programs/fontaliases/hp/C/sys26.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/sys26.pcf } # programs/fontaliases/hp/C/us11x19.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us11x19.pcf } # programs/fontaliases/hp/C/us11x19B.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us11x19B.pcf } # programs/fontaliases/hp/C/us12x23.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us12x23.pcf } # programs/fontaliases/hp/C/us12x23B.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us12x23B.pcf } # programs/fontaliases/hp/C/us14x26.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us14x26.pcf } # programs/fontaliases/hp/C/us14x26B.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us14x26B.pcf } # programs/fontaliases/hp/C/us6x13.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us6x13.pcf } # programs/fontaliases/hp/C/us6x13B.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us6x13B.pcf } # programs/fontaliases/hp/C/us6x14.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us6x14.pcf } # programs/fontaliases/hp/C/us6x14B.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us6x14B.pcf } # programs/fontaliases/hp/C/us8x16.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us8x16.pcf } # programs/fontaliases/hp/C/us8x16B.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us8x16B.pcf } # programs/fontaliases/hp/C/us9x17.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us9x17.pcf } # programs/fontaliases/hp/C/us9x17B.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/us9x17B.pcf } # #programs/fontaliases/hp/chinese-s/fonts.alias -#{ hp-ux +#{ hpux # install_target = /usr/dt/config/xfonts/chinese-s/fonts.alias #} # #programs/fontaliases/hp/chinese-s/fonts.dir -#{ hp-ux +#{ hpux # install_target = /usr/dt/config/xfonts/chinese-s/fonts.dir #} # #programs/fontaliases/hp/chinese-t/fonts.alias -#{ hp-ux +#{ hpux # install_target = /usr/dt/config/xfonts/chinese-t/fonts.alias #} # #programs/fontaliases/hp/chinese-t/fonts.dir -#{ hp-ux +#{ hpux # install_target = /usr/dt/config/xfonts/chinese-t/fonts.dir #} # programs/fontaliases/hp/japanese/fonts.alias -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/ja_JP.eucJP/fonts.alias } # programs/fontaliases/hp/japanese/fonts.dir -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/ja_JP.eucJP/fonts.dir } # programs/fontaliases/hp/japanese/dtinfo.pcf -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/C/dtinfo.pcf } # #programs/fontaliases/hp/korean/fonts.alias -#{ hp-ux +#{ hpux # install_target = /usr/dt/config/xfonts/korean/fonts.alias #} # #programs/fontaliases/hp/korean/fonts.dir -#{ hp-ux +#{ hpux # install_target = /usr/dt/config/xfonts/korean/fonts.dir #} # #/usr/dt/config/xfonts/chinese-t -#{ hp-ux +#{ hpux # install_target = /usr/dt/config/xfonts/chinese-t.big5 # type = sym_link #} # /usr/dt/config/xfonts/ja_JP.eucJP -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/japanese.euc type = sym_link } /usr/dt/config/xfonts/ja_JP.eucJP -{ hp-ux +{ hpux install_target = /usr/dt/config/xfonts/japanese type = sym_link } @@ -920,22 +920,22 @@ programs/fontaliases/dec/ja/75dpi/dtinfo.pcf # For HP 9.0 # programs/fontaliases/postscript/ja/prolog.ps -{ hp-ux +{ hpux install_target = /usr/dt/config/psfonts/japanese/prolog.ps } # #programs/fontaliases/postscript/ko/prolog.ps -#{ hp-ux +#{ hpux # install_target = /usr/dt/config/psfonts/korean/prolog.ps #} # #programs/fontaliases/postscript/zh/prolog.ps -#{ hp-ux +#{ hpux # install_target = /usr/dt/config/psfonts/chinese-s/prolog.ps #} # #programs/fontaliases/postscript/zh_TW/prolog.ps -#{ hp-ux +#{ hpux # install_target = /usr/dt/config/psfonts/chinese-t/prolog.ps #} diff --git a/cde/databases/CDE-HELP-LOC.src b/cde/databases/CDE-HELP-LOC.src index 41404c3d4..91f21ba39 100644 --- a/cde/databases/CDE-HELP-LOC.src +++ b/cde/databases/CDE-HELP-LOC.src @@ -9,10 +9,10 @@ XCOMM XCOMM ============================================= XCOMM >>------------------------------ -XCOMM Defaults for: hp-ux +XCOMM Defaults for: hpux XCOMM -------------------------------- XCOMM -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = %_FILENAME_% type = file @@ -31,7 +31,7 @@ XCOMM } XCOMM >>------------------------------ -XCOMM Defaults for: hp-ux 10.0 +XCOMM Defaults for: hpux 10.0 XCOMM -------------------------------- XCOMM { hpV4 : defaults @@ -132,7 +132,7 @@ XCOMM } XCOMM >>------------------------------------------------- -XCOMM Defaults for: everything else (identical to hp-ux) +XCOMM Defaults for: everything else (identical to hpux) XCOMM <<------------------------------------------------- XCOMM { default : defaults @@ -2865,63 +2865,63 @@ XCOMM ######################################################################### #ifdef __hpux #ifdef _GERMAN_ /usr/dt/appconfig/help/de_DE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/help/de_DE.iso88591 type = sym_link } #endif #ifdef _SPANISH_ /usr/dt/appconfig/help/es_ES.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/help/es_ES.iso88591 type = sym_link } #endif #ifdef _FRENCH_ /usr/dt/appconfig/help/fr_FR.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/help/fr_FR.iso88591 type = sym_link } #endif #ifdef _ITALIAN_ /usr/dt/appconfig/help/it_IT.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/help/it_IT.iso88591 type = sym_link } #endif #ifdef _JAPANESE_ /usr/dt/appconfig/help/ja_JP.dt-eucJP -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/help/ja_JP.eucJP type = sym_link } #endif #ifdef _KOREAN_ /usr/dt/appconfig/help/ko_KR.dt-eucKR -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/help/ko_KR.eucKR type = sym_link } #endif #ifdef _SWEDISH_ /usr/dt/appconfig/help/sv_SE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/help/sv_SE.iso88591 type = sym_link } #endif #ifdef _CHINESE_ /usr/dt/appconfig/help/zh_CN.dt-eucCN -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/help/zh_CN.hp15CN type = sym_link } #endif #ifdef _TAIWANESE_ /usr/dt/appconfig/help/zh_TW.dt-eucTW -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/help/zh_TW.ccdc type = sym_link } diff --git a/cde/databases/CDE-HELP-PRG.udb b/cde/databases/CDE-HELP-PRG.udb index caacb52f9..59a04e0da 100644 --- a/cde/databases/CDE-HELP-PRG.udb +++ b/cde/databases/CDE-HELP-PRG.udb @@ -13,10 +13,10 @@ #----------------------------------------------------------- #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #-------------------------------- # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-HELP-PRG type = file @@ -35,7 +35,7 @@ } #>>------------------------------ -# Defaults for: hp-ux 10.0 +# Defaults for: hpux 10.0 #-------------------------------- # { hpV4 : defaults @@ -101,7 +101,7 @@ } #>>------------------------------ # Default Defaults: for arbitrary systems. -# -- same as hp-ux -- +# -- same as hpux -- #-------------------------------- # { default : defaults diff --git a/cde/databases/CDE-HELP-RUN.udb b/cde/databases/CDE-HELP-RUN.udb index bd640feac..9ce756948 100644 --- a/cde/databases/CDE-HELP-RUN.udb +++ b/cde/databases/CDE-HELP-RUN.udb @@ -4,10 +4,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-HELP-RUN type = file @@ -25,7 +25,7 @@ responsible_project = cde_dt } #>>------------------------------ -# Defaults for: hp-ux 10.0 +# Defaults for: hpux 10.0 #<<------------------------------ # { hpV4 : defaults @@ -146,7 +146,7 @@ group = bin } #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults @@ -563,7 +563,7 @@ lib/DtHelp/CDE.lcx } # lib/DtHelp/HP-UX.lcx -{ hp-ux +{ hpux install_target = /usr/dt/config/svc/HP-UX.lcx } # diff --git a/cde/databases/CDE-ICONS.udb b/cde/databases/CDE-ICONS.udb index 4de156066..11d2b50f8 100644 --- a/cde/databases/CDE-ICONS.udb +++ b/cde/databases/CDE-ICONS.udb @@ -4,10 +4,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-ICONS type = file @@ -25,7 +25,7 @@ responsible_project = cde_dt } #>>------------------------------ -# Defaults for: hp-ux 10.0 +# Defaults for: hpux 10.0 #<<------------------------------ # { hpV4 : defaults @@ -147,7 +147,7 @@ group = bin } #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults diff --git a/cde/databases/CDE-INC.udb b/cde/databases/CDE-INC.udb index a769444b0..a1b3bb6b9 100644 --- a/cde/databases/CDE-INC.udb +++ b/cde/databases/CDE-INC.udb @@ -4,10 +4,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-INC type = file @@ -126,7 +126,7 @@ group = bin } #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults diff --git a/cde/databases/CDE-INFO.udb b/cde/databases/CDE-INFO.udb index be133a361..79b5bb839 100644 --- a/cde/databases/CDE-INFO.udb +++ b/cde/databases/CDE-INFO.udb @@ -4,10 +4,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-RUN type = file @@ -26,7 +26,7 @@ } # #>>------------------------------ -# Defaults for: hp-ux 10.0 +# Defaults for: hpux 10.0 #<<------------------------------ # { hpV4 : defaults @@ -136,7 +136,7 @@ } # #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults diff --git a/cde/databases/CDE-INFOLIB-LOC.src b/cde/databases/CDE-INFOLIB-LOC.src index 3532f673e..aba25f84b 100644 --- a/cde/databases/CDE-INFOLIB-LOC.src +++ b/cde/databases/CDE-INFOLIB-LOC.src @@ -4,10 +4,10 @@ XCOMM %_FILENAME_%.udb CDE universal database for InfoLibs XCOMM -------------------------------- XCOMM XCOMM >>------------------------------ -XCOMM Defaults for: hp-ux +XCOMM Defaults for: hpux XCOMM <<------------------------------ XCOMM -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = %_FILENAME_% type = file @@ -414,7 +414,7 @@ XCOMM ./../infolib/de_DE.ISO8859-1 #ifdef _GERMAN_ ../infolib/de_DE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/infolib/de_DE.iso88591 type = sym_link } @@ -422,7 +422,7 @@ XCOMM ./../infolib/de_DE.ISO8859-1 #ifdef _SPANISH_ ../infolib/es_ES.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/infolib/es_ES.iso88591 type = sym_link } @@ -430,7 +430,7 @@ XCOMM ./../infolib/de_DE.ISO8859-1 #ifdef _FRENCH_ ../infolib/fr_FR.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/infolib/fr_FR.iso88591 type = sym_link } @@ -438,7 +438,7 @@ XCOMM ./../infolib/de_DE.ISO8859-1 #ifdef _ITALIAN_ ../infolib/it_IT.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/infolib/it_IT.iso88591 type = sym_link } @@ -446,7 +446,7 @@ XCOMM ./../infolib/de_DE.ISO8859-1 #ifdef _JAPANESE_ ../infolib/ja_JP.dt-eucJP -{ hp-ux +{ hpux install_target = /usr/dt/infolib/ja_JP.eucJP type = sym_link } diff --git a/cde/databases/CDE-LOC.src b/cde/databases/CDE-LOC.src index fbfc5c55c..6fade41f6 100644 --- a/cde/databases/CDE-LOC.src +++ b/cde/databases/CDE-LOC.src @@ -4,10 +4,10 @@ XCOMM %_FILENAME_%.udb CDE runtime product universal database XCOMM -------------------------------- XCOMM XCOMM >>------------------------------ -XCOMM Defaults for: hp-ux +XCOMM Defaults for: hpux XCOMM <<------------------------------ XCOMM -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = %_FILENAME_% type = file @@ -82,7 +82,7 @@ XCOMM group = bin } XCOMM >>------------------------------------------------- -XCOMM Defaults for: everything else (identical to hp-ux) +XCOMM Defaults for: everything else (identical to hpux) XCOMM <<------------------------------------------------- XCOMM { default : defaults @@ -878,7 +878,7 @@ programs/localized/%_LANG_%/types/dtbuilder.dt } XCOMM programs/localized/%_LANG_%/types/hp.dt -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/types/%_LANG_%/hp.dt } XCOMM @@ -982,180 +982,180 @@ XCOMM ########################################################################## #ifdef __hpux #ifdef _GERMAN_ ./de_DE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/app-defaults/de_DE.iso88591 type = sym_link } ./de_DE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/appmanager/de_DE.iso88591 type = sym_link } ./de_DE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/types/de_DE.iso88591 type = sym_link } ./de_DE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/config/de_DE.iso88591 type = sym_link } ./desc.de_DE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/palettes/desc.de_DE.iso88591 type = sym_link } ./desc.de_DE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/backdrops/desc.de_DE.iso88591 type = sym_link } ./de_DE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/examples/types/de_DE.iso88591 type = sym_link } #endif #ifdef _SPANISH_ ./es_ES.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/app-defaults/es_ES.iso88591 type = sym_link } ./es_ES.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/appmanager/es_ES.iso88591 type = sym_link } ./es_ES.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/types/es_ES.iso88591 type = sym_link } ./es_ES.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/config/es_ES.iso88591 type = sym_link } ./desc.es_ES.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/palettes/desc.es_ES.iso88591 type = sym_link } ./desc.es_ES.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/backdrops/desc.es_ES.iso88591 type = sym_link } ./es_ES.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/examples/types/es_ES.iso88591 type = sym_link } #endif #ifdef _FRENCH_ ./fr_FR.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/app-defaults/fr_FR.iso88591 type = sym_link } ./fr_FR.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/appmanager/fr_FR.iso88591 type = sym_link } ./fr_FR.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/types/fr_FR.iso88591 type = sym_link } ./fr_FR.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/config/fr_FR.iso88591 type = sym_link } ./desc.fr_FR.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/palettes/desc.fr_FR.iso88591 type = sym_link } ./desc.fr_FR.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/backdrops/desc.fr_FR.iso88591 type = sym_link } ./fr_FR.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/examples/types/fr_FR.iso88591 type = sym_link } #endif #ifdef _ITALIAN_ ./it_IT.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/app-defaults/it_IT.iso88591 type = sym_link } ./it_IT.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/appmanager/it_IT.iso88591 type = sym_link } ./it_IT.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/types/it_IT.iso88591 type = sym_link } ./it_IT.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/config/it_IT.iso88591 type = sym_link } ./desc.it_IT.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/palettes/desc.it_IT.iso88591 type = sym_link } ./desc.it_IT.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/backdrops/desc.it_IT.iso88591 type = sym_link } ./it_IT.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/examples/types/it_IT.iso88591 type = sym_link } #endif #ifdef _JAPANESE_ ./ja_JP.dt-eucJP -{ hp-ux +{ hpux install_target = /usr/dt/app-defaults/ja_JP.eucJP type = sym_link } ./ja_JP.dt-eucJP -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/appmanager/ja_JP.eucJP type = sym_link } ./ja_JP.dt-eucJP -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/types/ja_JP.eucJP type = sym_link } ./ja_JP.dt-eucJP -{ hp-ux +{ hpux install_target = /usr/dt/config/ja_JP.eucJP type = sym_link } ./desc.ja_JP.dt-eucJP -{ hp-ux +{ hpux install_target = /usr/dt/share/palettes/desc.ja_JP.eucJP type = sym_link } ./desc.ja_JP.dt-eucJP -{ hp-ux +{ hpux install_target = /usr/dt/share/backdrops/desc.ja_JP.eucJP type = sym_link } @@ -1163,62 +1163,62 @@ XCOMM XCOMM dtimsstart configuration files XCOMM programs/dtimsstart/conf/hpux/ja_JP.eucJP -{ hp-ux +{ hpux install_target = /usr/dt/config/ims/ja_JP.eucJP } programs/dtimsstart/conf/hpux/xjim -{ hp-ux +{ hpux install_target = /usr/dt/config/ims/xjim } programs/dtimsstart/conf/hpux/atok8 -{ hp-ux +{ hpux install_target = /usr/dt/config/ims/atok8 } programs/dtimsstart/conf/hpux/vje -{ hp-ux +{ hpux install_target = /usr/dt/config/ims/vje } programs/dtimsstart/conf/hpux/egb -{ hp-ux +{ hpux install_target = /usr/dt/config/ims/egb } programs/dtimsstart/conf/hpux/builtin.jpn -{ hp-ux +{ hpux install_target = /usr/dt/config/ims/builtin.jpn } programs/dtimsstart/conf/hpux/none -{ hp-ux +{ hpux install_target = /usr/dt/config/ims/none } #endif #ifdef _KOREAN_ ./ko_KR.dt-eucKR -{ hp-ux +{ hpux install_target = /usr/dt/app-defaults/ko_KR.eucKR type = sym_link } ./ko_KR.dt-eucKR -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/appmanager/ko_KR.eucKR type = sym_link } ./ko_KR.dt-eucKR -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/types/ko_KR.eucKR type = sym_link } ./ko_KR.dt-eucKR -{ hp-ux +{ hpux install_target = /usr/dt/config/ko_KR.eucKR type = sym_link } ./desc.ko_KR.dt-eucKR -{ hp-ux +{ hpux install_target = /usr/dt/share/palettes/desc.ko_KR.eucKR type = sym_link } ./desc.ko_KR.dt-eucKR -{ hp-ux +{ hpux install_target = /usr/dt/share/backdrops/desc.ko_KR.eucKR type = sym_link } @@ -1226,125 +1226,125 @@ XCOMM XCOMM dtimsstart configuration files XCOMM programs/dtimsstart/conf/hpux/ko_KR.eucKR -{ hp-ux +{ hpux install_target = /usr/dt/config/ims/ko_KR.eucKR } programs/dtimsstart/conf/hpux/xkim -{ hp-ux +{ hpux install_target = /usr/dt/config/ims/xkim } programs/dtimsstart/conf/hpux/none -{ hp-ux +{ hpux install_target = /usr/dt/config/ims/none } #endif #ifdef _SWEDISH_ ./sv_SE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/app-defaults/sv_SE.iso88591 type = sym_link } ./sv_SE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/appmanager/sv_SE.iso88591 type = sym_link } ./sv_SE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/types/sv_SE.iso88591 type = sym_link } ./sv_SE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/config/sv_SE.iso88591 type = sym_link } ./desc.sv_SE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/palettes/desc.sv_SE.iso88591 type = sym_link } ./desc.sv_SE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/backdrops/desc.sv_SE.iso88591 type = sym_link } ./sv_SE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/share/examples/types/sv_SE.iso88591 type = sym_link } #endif #ifdef _CHINESE_ ./zh_CN.dt-eucCN -{ hp-ux +{ hpux install_target = /usr/dt/app-defaults/zh_CN.hp15CN type = sym_link } ./zh_CN.dt-eucCN -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/appmanager/zh_CN.hp15CN type = sym_link } ./zh_CN.dt-eucCN -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/types/zh_CN.hp15CN type = sym_link } ./zh_CN.dt-eucCN -{ hp-ux +{ hpux install_target = /usr/dt/config/zh_CN.hp15CN type = sym_link } ./desc.zh_CN.dt-eucCN -{ hp-ux +{ hpux install_target = /usr/dt/share/palettes/desc.zh_CN.hp15CN type = sym_link } ./desc.zh_CN.dt-eucCN -{ hp-ux +{ hpux install_target = /usr/dt/share/backdrops/desc.zh_CN.hp15CN type = sym_link } ./zh_CN.dt-eucCN -{ hp-ux +{ hpux install_target = /usr/dt/share/examples/types/zh_CN.hp15CN type = sym_link } #endif #ifdef _TAIWANESE_ ./zh_TW.dt-eucTW -{ hp-ux +{ hpux install_target = /usr/dt/app-defaults/zh_TW.ccdc type = sym_link } ./zh_TW.dt-eucTW -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/appmanager/zh_TW.ccdc type = sym_link } ./zh_TW.dt-eucTW -{ hp-ux +{ hpux install_target = /usr/dt/appconfig/types/zh_TW.ccdc type = sym_link } ./zh_TW.dt-eucTW -{ hp-ux +{ hpux install_target = /usr/dt/config/zh_TW.ccdc type = sym_link } ./desc.zh_TW.dt-eucTW -{ hp-ux +{ hpux install_target = /usr/dt/share/palettes/desc.zh_TW.ccdc type = sym_link } ./desc.zh_TW.dt-eucTW -{ hp-ux +{ hpux install_target = /usr/dt/share/backdrops/desc.zh_TW.ccdc type = sym_link } ./zh_TW.dt-eucTW -{ hp-ux +{ hpux install_target = /usr/dt/share/examples/types/zh_TW.ccdc type = sym_link } diff --git a/cde/databases/CDE-MAN-DEV.udb b/cde/databases/CDE-MAN-DEV.udb index 9a2df1f50..9c5c0b212 100644 --- a/cde/databases/CDE-MAN-DEV.udb +++ b/cde/databases/CDE-MAN-DEV.udb @@ -4,10 +4,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-MAN-DEV type = file @@ -25,7 +25,7 @@ responsible_project = cde_dt } #>>------------------------------ -# Defaults for: hp-ux 10.0 +# Defaults for: hpux 10.0 #<<------------------------------ # { hpV4 : defaults @@ -190,7 +190,7 @@ group = bin } #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults @@ -4496,7 +4496,7 @@ doc/C/man/man5/csacsa.5 #>>----------------------------------- # ./share/man -{ hp-ux +{ hpux install_target = /usr/dt/man type = sym_link } diff --git a/cde/databases/CDE-MAN.udb b/cde/databases/CDE-MAN.udb index 9f4258d7e..0c2d2d592 100644 --- a/cde/databases/CDE-MAN.udb +++ b/cde/databases/CDE-MAN.udb @@ -4,10 +4,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-MAN type = file @@ -25,7 +25,7 @@ responsible_project = cde_dt } #>>------------------------------ -# Defaults for: hp-ux 10.0 +# Defaults for: hpux 10.0 #<<------------------------------ # { hpV4 : defaults @@ -190,7 +190,7 @@ group = bin } #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults @@ -308,7 +308,7 @@ doc/C/man/man1/dtconfig.1 } # doc/C/man/man1/dtconvertvf.1 -{ hp-ux +{ hpux install_target = /usr/dt/share/man/man1/dtconvertvf.1 } { hpV4 @@ -1248,7 +1248,7 @@ doc/C/man/man6/ttsnoop.6 #>>----------------------------------- # ./share/man -{ hp-ux +{ hpux install_target = /usr/dt/man type = sym_link } diff --git a/cde/databases/CDE-MIN.udb b/cde/databases/CDE-MIN.udb index e6542efa3..17f06ed43 100644 --- a/cde/databases/CDE-MIN.udb +++ b/cde/databases/CDE-MIN.udb @@ -4,10 +4,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-MIN type = file @@ -25,7 +25,7 @@ responsible_project = cde_dt } #>>------------------------------ -# Defaults for: hp-ux 10.0 +# Defaults for: hpux 10.0 #<<------------------------------ # { hpV4 : defaults @@ -146,7 +146,7 @@ group = bin } #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults diff --git a/cde/databases/CDE-MSG-LOC.src b/cde/databases/CDE-MSG-LOC.src index 2a0b120a6..208013860 100644 --- a/cde/databases/CDE-MSG-LOC.src +++ b/cde/databases/CDE-MSG-LOC.src @@ -4,10 +4,10 @@ XCOMM %_FILENAME_%.udb CDE Localized Message Catalogs XCOMM ----------------------------------------------- XCOMM XCOMM >>------------------------------ -XCOMM Defaults for: hp-ux +XCOMM Defaults for: hpux XCOMM <<------------------------------ XCOMM -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = %_FILENAME_% type = file @@ -82,7 +82,7 @@ XCOMM group = bin } XCOMM >>------------------------------------------------- -XCOMM Defaults for: everything else (identical to hp-ux) +XCOMM Defaults for: everything else (identical to hpux) XCOMM <<------------------------------------------------- XCOMM { default : defaults @@ -411,63 +411,63 @@ XCOMM ########################################################################## #ifdef __hpux #ifdef _GERMAN_ /usr/dt/lib/nls/msg/de_DE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/nls/msg/de_DE.iso88591 type = sym_link } #endif #ifdef _SPANISH_ /usr/dt/lib/nls/msg/es_ES.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/nls/msg/es_ES.iso88591 type = sym_link } #endif #ifdef _FRENCH_ /usr/dt/lib/nls/msg/fr_FR.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/nls/msg/fr_FR.iso88591 type = sym_link } #endif #ifdef _ITALIAN_ /usr/dt/lib/nls/msg/it_IT.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/nls/msg/it_IT.iso88591 type = sym_link } #endif #ifdef _JAPANESE_ /usr/dt/lib/nls/msg/ja_JP.dt-eucJP -{ hp-ux +{ hpux install_target = /usr/dt/lib/nls/msg/ja_JP.eucJP type = sym_link } #endif #ifdef _KOREAN_ /usr/dt/lib/nls/msg/ko_KR.dt-eucKR -{ hp-ux +{ hpux install_target = /usr/dt/lib/nls/msg/ko_KR.eucKR type = sym_link } #endif #ifdef _SWEDISH_ /usr/dt/lib/nls/msg/sv_SE.ISO8859-1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/nls/msg/sv_SE.iso88591 type = sym_link } #endif #ifdef _CHINESE_ /usr/dt/lib/nls/msg/zh_CN.dt-eucCN -{ hp-ux +{ hpux install_target = /usr/dt/lib/nls/msg/zh_CN.hp15CN type = sym_link } #endif #ifdef _TAIWANESE_ /usr/dt/lib/nls/msg/zh_TW.dt-eucTW -{ hp-ux +{ hpux install_target = /usr/dt/lib/nls/msg/zh_TW.ccdc type = sym_link } diff --git a/cde/databases/CDE-PRG.udb b/cde/databases/CDE-PRG.udb index 09ae931ef..62de88d48 100644 --- a/cde/databases/CDE-PRG.udb +++ b/cde/databases/CDE-PRG.udb @@ -4,10 +4,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-PRG type = file @@ -25,7 +25,7 @@ responsible_project = cde_dt } #>>------------------------------ -# Defaults for: hp-ux 10.0 +# Defaults for: hpux 10.0 #<<------------------------------ # { hpV4 : defaults @@ -147,7 +147,7 @@ group = bin } #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults diff --git a/cde/databases/CDE-RUN.udb b/cde/databases/CDE-RUN.udb index d534e9bbc..5786341ff 100644 --- a/cde/databases/CDE-RUN.udb +++ b/cde/databases/CDE-RUN.udb @@ -4,10 +4,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-RUN type = file @@ -25,7 +25,7 @@ responsible_project = cde_dt } #>>------------------------------ -# Defaults for: hp-ux 10.0 +# Defaults for: hpux 10.0 #<<------------------------------ # { hpV4 : defaults @@ -146,7 +146,7 @@ group = bin } #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults @@ -179,7 +179,7 @@ programs/dtlogin/config/Xfailsafe } # programs/dtconfig/hp/dtrc -{ hp-ux +{ hpux install_target = /usr/dt/bin/dtrc mode = 0544 } @@ -527,7 +527,7 @@ programs/localized/C/config/dtfile.config } programs/util/scripts/convertvf -{ hp-ux +{ hpux install_target = /usr/dt/bin/dtconvertvf mode = 0555 } @@ -1175,10 +1175,10 @@ programs/dtlogin/dtgreet mode = 0544 } # -# Create hpterm link on hp-ux only +# Create hpterm link on hpux only # /usr/bin/X11/hpterm -{ hp-ux +{ hpux install_target = /usr/dt/bin/hpterm owner = root type = sym_link @@ -1214,7 +1214,7 @@ programs/dtaction/dtaction } # programs/dtaction/dtaction -{ hp-ux +{ hpux install_target = /usr/dt/bin/dtaction owner = root group = sys @@ -1589,7 +1589,7 @@ programs/localized/C/types/dthelp.dt } # #programs/localized/C/types/hp.dt -#{ hp-ux +#{ hpux # install_target = /usr/dt/appconfig/types/C/hp.dt #} # diff --git a/cde/databases/CDE-SHLIBS.src b/cde/databases/CDE-SHLIBS.src index adb4e718c..6e06c2b56 100644 --- a/cde/databases/CDE-SHLIBS.src +++ b/cde/databases/CDE-SHLIBS.src @@ -4,10 +4,10 @@ XCOMM CDE-SHLIBS.udb Installs all CDE shared libraries XCOMM -------------------------------- XCOMM XCOMM >>------------------------------ -XCOMM Defaults for: hp-ux +XCOMM Defaults for: hpux XCOMM <<------------------------------ XCOMM -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-SHLIBS type = file @@ -25,7 +25,7 @@ XCOMM responsible_project = cde_dt } XCOMM >>------------------------------ -XCOMM Defaults for: hp-ux 10.0 +XCOMM Defaults for: hpux 10.0 XCOMM <<------------------------------ XCOMM { hpV4 : defaults @@ -147,7 +147,7 @@ XCOMM group = bin } XCOMM >>------------------------------------------------- -XCOMM Defaults for: everything else (identical to hp-ux) +XCOMM Defaults for: everything else (identical to hpux) XCOMM <<------------------------------------------------- XCOMM { default : defaults @@ -646,137 +646,137 @@ lib/DtMmdb/libDtMmdb.a } XCOMM XCOMM >>----------------------------- -XCOMM HP-UX 10.0 libraries +XCOMM HPUX 10.0 libraries XCOMM <<----------------------------- XCOMM ./libXm.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libXm.1.2 type = sym_link } XCOMM ./libXm.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libXm.3 type = sym_link } XCOMM ./libMrm.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libMrm.1.2 type = sym_link } XCOMM ./libMrm.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libMrm.3 type = sym_link } XCOMM ./libUil.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libUil.1.2 type = sym_link } XCOMM ./libUil.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libUil.3 type = sym_link } XCOMM lib/DtHelp/libDtHelp.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtHelp.sl.2.1 mode = 0555 } XCOMM ./libDtHelp.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtHelp.1 type = sym_link } XCOMM lib/DtPrint/libDtPrint.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtPrint.sl.2.1 mode = 0555 } XCOMM lib/DtMrm/libDtMrm.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtMrm.sl.2.1 mode = 0555 } XCOMM lib/DtSvc/libDtSvc.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtSvc.sl.2.1 mode = 0555 } XCOMM ./libDtSvc.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtSvc.1 type = sym_link } XCOMM lib/DtWidget/libDtWidget.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtWidget.sl.2.1 mode = 0555 } XCOMM ./libDtWidget.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtWidget.1 type = sym_link } XCOMM lib/DtTerm/libDtTerm.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtTerm.sl.2.1 mode = 0555 } XCOMM ./libDtTerm.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtTerm.1 type = sym_link } XCOMM lib/tt/lib/libtt.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libtt.sl.2.1 mode = 0555 } XCOMM ./libtt.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libtt.2 type = sym_link } XCOMM lib/csa/libcsa.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libcsa.sl.2.1 mode = 0555 } XCOMM ./libcsa.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libcsa.0 type = sym_link } XCOMM lib/DtSearch/libDtSearch.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtSearch.sl.2.1 mode = 0555 } XCOMM lib/DtMmdb/libDtMmdb.sl.2.1 -{ hp-ux +{ hpux install_target = /usr/dt/lib/libDtMmdb.sl.2.1 mode = 0755 } diff --git a/cde/databases/CDE-TT.udb b/cde/databases/CDE-TT.udb index 50f3f9bfc..75643234f 100644 --- a/cde/databases/CDE-TT.udb +++ b/cde/databases/CDE-TT.udb @@ -4,10 +4,10 @@ #-------------------------------- # #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # -{ hp-ux : defaults +{ hpux : defaults install_target = fileset = CDE-TT type = file @@ -25,7 +25,7 @@ responsible_project = cde_dt } #>>------------------------------ -# Defaults for: hp-ux +# Defaults for: hpux #<<------------------------------ # { hpV4 : defaults @@ -146,7 +146,7 @@ group = bin } #>>------------------------------------------------- -# Defaults for: everything else (identical to hp-ux) +# Defaults for: everything else (identical to hpux) #<<------------------------------------------------- # { default : defaults diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile index bb3f8e292..80b7ca455 100644 --- a/cde/databases/Imakefile +++ b/cde/databases/Imakefile @@ -7,7 +7,7 @@ XCOMM $TOG: Imakefile /main/17 1998/03/19 09:46:16 mgreess $ * Trigger different installation behavior for HPUX 10.0 and later. */ #if defined (HPArchitecture) && (OSMajorVersion > 9) -UDB_RELEASE_OPT = -ReleaseStream hp-ux +UDB_RELEASE_OPT = -ReleaseStream hpux #endif #ifdef SunArchitecture UDB_RELEASE_OPT = -ReleaseStream sun @@ -41,13 +41,7 @@ UDB_RELEASE_OPT = -ReleaseStream netbsd * Insure that symbols used in the .udb files are undefined for * pre-processing by cpp. */ -#if defined(LinuxArchitecture) || defined(BSDArchitecture) || \ - defined(RsArchitecture) -/* cpp of some systems reject "hp-ux" as an invalid sub-option. */ -UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix -#else -UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uhp-ux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix -Ulinux -Uopenbsd -Ufreebsd -Unetbsd -#endif +UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix -Ulinux -Uopenbsd -Ufreebsd -Unetbsd #define CreateLocalizedFilesets(Locale,Lang,readablename,runfs,helpfs,msgfs,AltLang,HelpLang,ResDB,HelpDB,MsgDB,InfoDB) @@\