X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Fncurses-config.in;h=476d384e3ef34f23ad99f26ca3e823d914eaf367;hp=a68f17143334321d53d3ba769d5e2e294af3dd37;hb=d66080c21038ad4feb2e41a0c4e517d5b4a03ab2;hpb=0819b56c3096ed77dd36312b0c4e8f37e7d46c88

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index a68f1714..476d384e 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.34 2015/04/18 17:25:07 tom Exp $
+# $Id: ncurses-config.in,v 1.36 2017/12/09 22:45:44 tom Exp $
 ##############################################################################
-# Copyright (c) 2006-2012,2015 Free Software Foundation, Inc.                #
+# Copyright (c) 2006-2015,2017 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -49,7 +49,7 @@ THIS="@LIB_NAME@@USE_LIB_SUFFIX@"
 TINFO_LIB="@TINFO_ARG_SUFFIX@"
 RPATH_LIST="@RPATH_LIST@"
 
-includesubdir="@includedir@/${THIS}@EXTRA_SUFFIX@"
+includesubdir="@includedir@/${THIS}"
 
 # Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
 # We cannot filter it out within the build-process since the variable is used
@@ -145,7 +145,13 @@ ENDECHO
 		echo "${datadir}"
 		;;
 	--includedir)
-		echo "${includedir}"
+		INCS=
+		if test "x@WITH_OVERWRITE@" = xno ; then
+			INCS="${includesubdir}"
+		elif test "${includedir}" != /usr/include ; then
+			INCS="${includedir}"
+		fi
+		echo $INCS
 		;;
 	--libdir)
 		echo "${libdir}"