ncurses 5.9 - patch 20120331

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

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 4b450da4bf020be093601145a502c6f5d051eca8..56b170f1e44277820c720612488cd0319e759ae8 100644 (file)
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.11 2011/11/26 20:55:38 Mike.Frysinger Exp $
+# $Id: gen-pkgconfig.in,v 1.14 2012/01/01 01:48:23 tom Exp $
 ##############################################################################
 # Copyright (c) 2009-2010,2011 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -63,11 +63,6 @@ PANEL_LIBRARY="${PANEL_NAME}@DFT_ARG_SUFFIX@"
 MENU_LIBRARY="${MENU_NAME}@DFT_ARG_SUFFIX@"
 FORM_LIBRARY="${FORM_NAME}@DFT_ARG_SUFFIX@"
 
-SUB_LIBRARY_REQ=${SUB_LIBRARY}
-if test $TINFO_NAME = $LIB_NAME ; then
-       SUB_LIBRARY_REQ=
-fi
-
 if test "$includedir" = "/usr/include" ; then
        CFLAGS=
 else
@@ -82,7 +77,7 @@ fi
 
 for name in @PC_MODULES_TO_MAKE@
 do
-       name="${name}@DFT_ARG_SUFFIX@"
+       name="${name}"
 
        desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
        reqs=
@@ -99,7 +94,7 @@ do
                desc="$desc add-on library"
        fi
 
-       if test $name != $SUB_LIBRARY ; then
+       if test $name != $SUB_LIBRARY && test $SUB_LIBRARY != $MAIN_LIBRARY ; then
                if test $name != $TINFO_NAME ; then
                        test -n "$reqs" && reqs="$reqs, "
                        reqs="${reqs}${SUB_LIBRARY}"