diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-01-31 00:16:41 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-01-31 00:16:41 +0000 |
commit | 342bb390870f16034fba04be98ee287bab89e410 (patch) | |
tree | 13dea8e36c2ce21f0255f6069a59a975bec6e1b1 | |
parent | d23a0009b2463ce8bdb13bc1bf2c4efc29d82c89 (diff) | |
download | netpbm-mirror-342bb390870f16034fba04be98ee287bab89e410.tar.gz netpbm-mirror-342bb390870f16034fba04be98ee287bab89e410.tar.xz netpbm-mirror-342bb390870f16034fba04be98ee287bab89e410.zip |
Add to rgb.txt search path
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2678 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r-- | config.mk.in | 4 | ||||
-rw-r--r-- | doc/HISTORY | 3 | ||||
-rw-r--r-- | pm_config.in.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/config.mk.in b/config.mk.in index 0f2ccb6c..b63831aa 100644 --- a/config.mk.in +++ b/config.mk.in @@ -662,5 +662,5 @@ NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ #NETPBM_DOCURL = file:/usr/doc/netpbm/ # RGB_DB_PATH is where Netpbm looks for the color database when the RGBDEF -# environment variable is not set. See pm_config_in.h for details. -RGB_DB_PATH = /usr/share/netpbm/rgb.txt:/usr/lib/X11/rgb.txt:/usr/share/X11/rgb.txt:/usr/X11R6/lib/X11/rgb.txt +# environment variable is not set. See pm_config.in.h for details. +RGB_DB_PATH = /usr/local/netpbm/rgb.txt:/usr/share/netpbm/rgb.txt:/etc/X11/rgb.txt:/usr/lib/X11/rgb.txt:/usr/share/X11/rgb.txt:/usr/X11R6/lib/X11/rgb.txt diff --git a/doc/HISTORY b/doc/HISTORY index f016160f..6c022c32 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -8,6 +8,9 @@ not yet BJH Release 10.74.00 pnmtopsnr: Add -machine, -max . + Netpbmlib: add /usr/local/netpbm/lib and /etc/X11 to search + path for rgb.txt. + 15.12.26 BJH Release 10.73.00 anytopnm: use --mime-type option instead of --mime on newer diff --git a/pm_config.in.h b/pm_config.in.h index 9d0dc303..72cb477e 100644 --- a/pm_config.in.h +++ b/pm_config.in.h @@ -63,7 +63,7 @@ /* CONFIGURE: There should be an environment variable telling where the color ** names database (color dictionary) is for Netpbm to use, e.g. to determine -** what colord name "Salmon" is. The name of that environment variable is +** what color "Salmon" is. The name of that environment variable is ** above. But as some people prefer hardcoded file paths to environment ** variables, if such environment variable is not set, Netpbm looks for the ** first existing file in the list which is the value of 'RGB_DB_PATH'. And |