diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-06-25 15:50:40 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-06-25 15:50:40 +0000 |
| commit | d42c82be90a7878bcff17012e45832c9a09ba059 (patch) | |
| tree | 5be4cd1e9ec4cab89d42a6130136c26edeb11f6f | |
| parent | bf1a28688e84d370b3c4a625117a504a64fd1ad8 (diff) | |
| download | netpbm-mirror-d42c82be90a7878bcff17012e45832c9a09ba059.tar.gz netpbm-mirror-d42c82be90a7878bcff17012e45832c9a09ba059.tar.xz netpbm-mirror-d42c82be90a7878bcff17012e45832c9a09ba059.zip | |
Allow environment variables used with 'make check' to be overridden on command line
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1956 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | GNUmakefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index 489d6888..c90baa49 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -72,6 +72,10 @@ NOMERGEBINARIES = netpbm OBJECTS = netpbm.o +PBM_TESTPREFIX ?= $(PKGDIR)/bin +PBM_LIBRARY_PATH ?= $(PKGDIR)/lib +RGBDEF ?= $(SRCDIR)/lib/rgb.txt + default: $(DEFAULT_TARGET) echo "EXISTENCE OF THIS FILE MEANS NETPBM HAS BEEN BUILT." \ >build_complete @@ -412,9 +416,9 @@ check: # This works on typical Linux systems if [ ! -d $(RESULTDIR) ]; then mkdir -pv $(RESULTDIR); fi cd $(RESULTDIR); \ - PBM_TESTPREFIX=$(PKGDIR)/bin \ - LD_LIBRARY_PATH=$(PKGDIR)/lib \ - RGBDEF=$(SRCDIR)/lib/rgb.txt \ + PBM_TESTPREFIX=$(PBM_TESTPREFIX) \ + LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):$LD_LIBRARY_PATH \ + RGBDEF=$(RGBDEF) \ $(SRCDIR)/test/Execute-Tests 2>&1 clean: localclean |