ncurses 5.9 - patch 20150221

[ncurses.git] / misc / gen-pkgconfig.in

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index d3e30e040f197e521a6eaa4c37e196a59d24017d..ab38238a6510abb112beaf2650b50a68a57ef308 100644 (file)
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.19 2014/12/14 00:38:23 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.21 2015/02/21 21:36:31 tom Exp $
 ##############################################################################
-# Copyright (c) 2009-2013,2014 Free Software Foundation, Inc.                #
+# Copyright (c) 2009-2014,2015 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"), #
@@ -64,17 +64,15 @@ PANEL_LIBRARY="${PANEL_NAME}@DFT_ARG_SUFFIX@"
 MENU_LIBRARY="${MENU_NAME}@DFT_ARG_SUFFIX@"
 FORM_LIBRARY="${FORM_NAME}@DFT_ARG_SUFFIX@"
 
-if test "$includedir" = "/usr/include" ; then
-       CFLAGS=
-else
+CFLAGS="@PKG_CFLAGS@"
+if test "$includedir" != "/usr/include" ; then
        includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include/,'`
        test "$includetop" = "/usr/include" && includetop="$includedir"
        if test "x$includetop" != "$includedir"
        then
-               CFLAGS="-I${includetop} -I\${includedir}"
-       else
-               CFLAGS="-I\${includedir}"
+               CFLAGS="$CFLAGS -I${includetop}"
        fi
+       CFLAGS="$CFLAGS -I\${includedir}"
 fi
 
 if test "$libdir" = "/usr/lib" ; then