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

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index f5e6e7ed..476d384e 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.30 2012/11/11 00:14:28 tom Exp $
+# $Id: ncurses-config.in,v 1.36 2017/12/09 22:45:44 tom Exp $
 ##############################################################################
-# Copyright (c) 2006-2011,2012 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"), #
@@ -45,10 +45,12 @@ datarootdir="@datarootdir@"
 datadir="@datadir@"
 mandir="@mandir@"
 
-THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
+THIS="@LIB_NAME@@USE_LIB_SUFFIX@"
 TINFO_LIB="@TINFO_ARG_SUFFIX@"
 RPATH_LIST="@RPATH_LIST@"
 
+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
 # in some special cases of installation using a relative path.
@@ -78,7 +80,7 @@ fi
 #	<ncurses@LIB_SUFFIX@/curses.h>
 if test x@WITH_OVERWRITE@ = xno ; then
 	case $includedir in
-	$prefix/include/ncurses@LIB_SUFFIX@)
+	$prefix/include/ncurses@LIB_SUFFIX@@EXTRA_SUFFIX@)
 		includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
 		;;
 	esac
@@ -97,9 +99,9 @@ while test $# -gt 0; do
 		;;
 	# compile/link
 	--cflags)
-		INCS=
+		INCS="@PKG_CFLAGS@"
 		if test "x@WITH_OVERWRITE@" = xno ; then
-			INCS="$INCS -I${includedir}/${THIS}"
+			INCS="$INCS -I${includesubdir}"
 		fi
 		if test "${includedir}" != /usr/include ; then
 			INCS="$INCS -I${includedir}"
@@ -143,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}"
@@ -163,7 +171,7 @@ ENDECHO
 	# general info
 	--help)
 		cat <<ENDHELP
-Usage: ${THIS}-config [options]
+Usage: `basename $0` [options]
 
 Options:
   --prefix           echos the package-prefix of ${THIS}