ncurses 6.0 - patch 20160806

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

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 586f9949e38b30369c557f4d95a4655e1d01df60..62d09ff61905b8ccfee6443dcd37efdb354065f0 100644 (file)
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,5 +1,5 @@
 #!@SHELL@
 #!@SHELL@

-# $Id: gen-pkgconfig.in,v 1.27 2015/05/04 09:15:46 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.29 2015/07/04 20:37:01 tom Exp $

 ##############################################################################
 # Copyright (c) 2009-2014,2015 Free Software Foundation, Inc.                #
 #                                                                            #
 ##############################################################################
 # Copyright (c) 2009-2014,2015 Free Software Foundation, Inc.                #
 #                                                                            #


@@ -66,16 +66,16 @@ FORM_LIBRARY="${FORM_NAME}@USE_ARG_SUFFIX@"
 
 CFLAGS="@PKG_CFLAGS@"
 if test "$includedir" != "/usr/include" ; then
 
 CFLAGS="@PKG_CFLAGS@"
 if test "$includedir" != "/usr/include" ; then

-       includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include/,'`
+       includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`

        test "$includetop" = "/usr/include" && includetop="$includedir"
        test "$includetop" = "/usr/include" && includetop="$includedir"

-       if test "x$includetop" != "$includedir"
+       if test "x$includetop" != "x$includedir"

        then
                CFLAGS="$CFLAGS -I${includetop}"
        fi
        CFLAGS="$CFLAGS -I\${includedir}"
 fi
 
        then
                CFLAGS="$CFLAGS -I${includetop}"
        fi
        CFLAGS="$CFLAGS -I\${includedir}"
 fi
 

-LDFLAGS="@LDFLAGS@"
+LDFLAGS=

 if test "$libdir" != "/usr/lib" ; then
        LDFLAGS="$LDFLAGS -L\${libdir}"
 fi
 if test "$libdir" != "/usr/lib" ; then
        LDFLAGS="$LDFLAGS -L\${libdir}"
 fi