diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-12-12 03:43:47 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-12-12 03:43:47 +0000 |
| commit | ccfc548cc8507b16397f674cbb0a8911781e27b4 (patch) | |
| tree | c944ab1e10abc33fb12cc479dabe0708bbbf224e /common.mk | |
| parent | a72930bd1433b10c43def3be55c02c53264b4a43 (diff) | |
| download | netpbm-mirror-ccfc548cc8507b16397f674cbb0a8911781e27b4.tar.gz netpbm-mirror-ccfc548cc8507b16397f674cbb0a8911781e27b4.tar.xz netpbm-mirror-ccfc548cc8507b16397f674cbb0a8911781e27b4.zip | |
various changes to test facility
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1806 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/common.mk b/common.mk index f93c9e0f..5ac872fd 100644 --- a/common.mk +++ b/common.mk @@ -109,12 +109,24 @@ LDLIBS = $(LOADLIBES) $(LIBS) # disastrous if PKGDIR is a relative directory, and I don't know any # way to detect that case and fail, so I just add a '/' to the front # if it isn't already there. +# +# TODO: Convert 'pkgdir' to absolute path with # the $(abspath ...) +# built-in function, available from GNU Make v 3.81 onward. ifneq ($(pkgdir)x,x) - PKGDIR = $(patsubst //%, /%, /$(pkgdir)) + PKGDIR = $(patsubst //%,/%, /$(pkgdir)) else PKGDIR = $(PKGDIR_DEFAULT) endif + +# 'resultdir', like 'pkgdir' is meant to be supplied from the make +# command line. Unlike 'pkgdir' we allow relative paths. +ifneq ($(resultdir)x,x) + RESULTDIR = $(resultdir) +else + RESULTDIR = $(RESULTDIR_DEFAULT) +endif + #=========================================================================== # We build a directory full of symbolic links to the intra-Netpbm public # header files just so the compile commands don't have to be littered |