diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-09-02 05:33:04 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-09-02 05:33:04 +0000 |
| commit | 679223c20cf46a698f35cd6ea468efd8292336f0 (patch) | |
| tree | 06f85ac235d4242306b17264b22fb333d2bd2226 | |
| parent | 59f50395d29d7809a31716b1bdefea8005a790ae (diff) | |
| download | netpbm-mirror-679223c20cf46a698f35cd6ea468efd8292336f0.tar.gz netpbm-mirror-679223c20cf46a698f35cd6ea468efd8292336f0.tar.xz netpbm-mirror-679223c20cf46a698f35cd6ea468efd8292336f0.zip | |
Provide means of setting default search path for rgb.txt via config.mk
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2265 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | GNUmakefile | 1 | ||||
| -rw-r--r-- | config.mk.in | 5 | ||||
| -rw-r--r-- | doc/HISTORY | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index 80d4b5b0..4be3c7c8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -171,6 +171,7 @@ ifeq ($(DONT_HAVE_PROCESS_MGMT),Y) else echo "#define HAVE_FORK 1" >>$@ endif + echo '#define RGB_DB_PATH "$(RGB_DB_PATH)"' >>$@ echo '/* pm_config.h.in FOLLOWS ... */' >>$@ cat $(SRCDIR)/pm_config.in.h >>$@ $(ENDIANGEN) >>$@ diff --git a/config.mk.in b/config.mk.in index 09195b20..a59006e7 100644 --- a/config.mk.in +++ b/config.mk.in @@ -652,8 +652,11 @@ DLLVER = #library, and file type. E.g. The documentation for jpegtopnm might be in #http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets #installed in the man pages (which say no more than to read the webpage) -#and in the Webman netpbm.url file. +#and in the Manweb netpbm.url file. NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ #For a system with no web access, but a local copy of the 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 diff --git a/doc/HISTORY b/doc/HISTORY index 883ed200..c0ba9751 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -85,6 +85,9 @@ not yet BJH Release 10.68.00 Windows build: include an icon in every executable. The icon was designed by Ron Vantreese (ait_frog-netpbm@yahoo.com). + Build: provide means of setting the default search path for + rgb.txt color database via config.mk. + Build: fix bug in which null value is not taken to mean "in the system search path" for JBIGHDR_DIR and JASPERHDR_DIR. |