ncurses 5.9 - patch 20140118

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

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index c924bc633fac2d8fb0bd30ca87ae903820c96274..92fcda68b758ae25a890159cd8cd06d5960466ed 100644 (file)
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.10 2011/10/08 19:20:15 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.16 2014/01/18 20:21:45 tom Exp $
 ##############################################################################
-# Copyright (c) 2009-2010,2011 Free Software Foundation, Inc.                #
+# Copyright (c) 2009-2013,2014 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"), #
@@ -39,22 +39,22 @@
 # library, except that the tinfo library does not depend on ncurses.
 LIB_NAME=@LIB_NAME@
 TINFO_NAME=@TINFO_NAME@
-PANEL_NAME=panel # @PANEL_NAME@
-MENU_NAME=menu # @MENU_NAME@
-FORM_NAME=form # @FORM_NAME@
-CXX_NAME=ncurses++ # @CXX_NAME@
+PANEL_NAME=@PANEL_NAME@
+MENU_NAME=@MENU_NAME@
+FORM_NAME=@FORM_NAME@
+CXX_NAME=@CXX_NAME@
 DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
 TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
 CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
-includedir="@includedir@"
+includedir="@includedir@@includesubdir@"
 libdir="@libdir@"
 
 show_prefix='@prefix@'
 show_exec_prefix='@exec_prefix@'
-show_includedir='@includedir@'
+show_includedir='@includedir@@includesubdir@'
 show_libdir='@libdir@'
 
 MAIN_LIBRARY="${LIB_NAME}@DFT_ARG_SUFFIX@"
@@ -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
@@ -80,22 +75,9 @@ else
        LDFLAGS="-L\${libdir}"
 fi
 
-for lib in ../lib/*
+for name in @PC_MODULES_TO_MAKE@
 do
-       name=`basename $lib`
-       if test "$name" = "*" ; then
-               break
-       fi
-
-       root=`basename $name "$DFT_DEP_SUFFIX"`
-       if test "$name" = "$root" ; then
-               root=`basename $name "$CXX_LIB_SUFFIX"`
-               if test "$name" = "$root" ; then
-                       continue
-               fi
-       fi
-
-       name=`echo "$name" | sed -e 's/^lib//' -e 's/\..*$//'`
+       name="${name}"
 
        desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
        reqs=
@@ -112,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}"
@@ -121,8 +103,6 @@ do
 
        echo "** creating ${name}.pc"
        cat >${name}.pc <<EOF
-# vile:makemode
-
 prefix=$show_prefix
 exec_prefix=$show_exec_prefix
 libdir=$show_libdir