diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-01-01 22:54:20 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-01-01 22:54:20 +0000 |
| commit | 984eb9257e2f1f64046a8a1f8c9ae5a5a80e232b (patch) | |
| tree | 3359b426b592cbc7fa6c4e761576e43b90543d10 /common.mk | |
| parent | 82b1f0b4cf88fe5fc757b6718763a3bad5e59166 (diff) | |
| download | netpbm-mirror-984eb9257e2f1f64046a8a1f8c9ae5a5a80e232b.tar.gz netpbm-mirror-984eb9257e2f1f64046a8a1f8c9ae5a5a80e232b.tar.xz netpbm-mirror-984eb9257e2f1f64046a8a1f8c9ae5a5a80e232b.zip | |
Properly qualify Netpbm include files - avoid conflict with DJGPP's <io.h>
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2367 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common.mk b/common.mk index a4fed0f0..48c63c69 100644 --- a/common.mk +++ b/common.mk @@ -86,8 +86,13 @@ include $(SRCDIR)/version.mk # importinc/pam.h (as it did originally) is that it lives on a user's system # as <netpbm/pam.h>, and therefore all _exported_ header files do say # "<netpbm/pam.h>. +ifneq ($(ALL_INTERNAL_HEADER_FILES_ARE_QUALIFIED),Y) + LEGACY_NETPBM_INCLUDE = -Iimportinc/netpbm +else + LEGACY_NETPBM_INCLUDE = +endif -NETPBM_INCLUDES := -Iimportinc -Iimportinc/netpbm -I$(SRCDIR)/$(SUBDIR) +NETPBM_INCLUDES := -Iimportinc $(LEGACY_NETPBM_INCLUDE) -I$(SRCDIR)/$(SUBDIR) # -I. is needed when builddir != srcdir INCLUDES = -I. $(COMP_INCLUDES) $(NETPBM_INCLUDES) $(EXTERN_INCLUDES) |