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'.
This commit is contained in:
Jon Trulson
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user