X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Fgen-pkgconfig.in;h=d3e30e040f197e521a6eaa4c37e196a59d24017d;hp=c924bc633fac2d8fb0bd30ca87ae903820c96274;hb=b0b1980be11bba618d84beb8b30ac94e2c820602;hpb=44a4147009bf2978d342175fb52b7f0999e11b5f;ds=sidebyside

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index c924bc63..d3e30e04 100644
--- 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.19 2014/12/14 00:38:23 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,23 @@
 # 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@
 
+suffix=@PC_MODULE_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,15 +64,17 @@ 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
-	CFLAGS="-I\${includedir}"
+	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}"
+	fi
 fi
 
 if test "$libdir" = "/usr/lib" ; then
@@ -80,22 +83,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=
@@ -105,24 +95,22 @@ do
 	elif test $name = $SUB_LIBRARY ; then
 		desc="$desc terminal interface library"
 	elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
-		reqs="$PANEL_LIBRARY, $MENU_LIBRARY, $FORM_LIBRARY, $MAIN_LIBRARY"
+		reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
 		desc="$desc add-on library"
 	else
-		reqs="$MAIN_LIBRARY"
+		reqs="$MAIN_LIBRARY${suffix}"
 		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}"
+			reqs="${reqs}${SUB_LIBRARY}${suffix}"
 		fi
 	fi
 
 	echo "** creating ${name}.pc"
-	cat >${name}.pc <<EOF
-# vile:makemode
-
+	cat >${name}${suffix}.pc <<EOF
 prefix=$show_prefix
 exec_prefix=$show_exec_prefix
 libdir=$show_libdir
@@ -130,7 +118,7 @@ includedir=$show_includedir
 major_version=@NCURSES_MAJOR@
 version=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
 
-Name: $name
+Name: ${name}${suffix}
 Description: $desc
 Version: \${version}
 URL: http://invisible-island.net/ncurses