X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Fncurses-config.in;h=7a6180f83158431f5f6ca47e7c043e7c4929bb66;hp=73cbfff6bfbf2f684abfeded2cfb0f866a2aa1ce;hb=e23d7db3de8b85766c7c1ccf66b738870b473da2;hpb=ee1bcda2cbb28cd84f136d8343cf83b7e576bd79

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 73cbfff6..7a6180f8 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.35 2015/04/22 00:54:19 tom Exp $
+# $Id: ncurses-config.in,v 1.37 2018/06/09 22:29:01 tom Exp $
 ##############################################################################
-# Copyright (c) 2006-2012,2015 Free Software Foundation, Inc.                #
+# Copyright (c) 2006-2017,2018 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"), #
@@ -117,13 +117,14 @@ ENDECHO
 		else
 			LIBDIR=-L$libdir
 		fi
+		LIBS="@LIBS@ @PRIVATE_LIBS@"
 		if test @TINFO_NAME@ = @LIB_NAME@ ; then
 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
+			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} $LIBS
 ENDECHO
 		else
 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
+			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} $LIBS
 ENDECHO
 		fi
 		;;
@@ -145,7 +146,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}"