Commit 1f2295a8 authored by gropp's avatar gropp
Browse files

Added pkgconfig option

parent bb7405c7
......@@ -296,6 +296,7 @@ $mandir_name = "mandir = \@mandir\@";
$htmldir_name = "htmldir = \@htmldir\@";
$docdir_name = "docdir = \@docdir\@";
$sysconfdir_name = "sysconfdir = \@sysconfdir\@";
$pkgconfigdir_name = "pkgconfigdir = \@libdir\@/pkgconfig";
$builddir_name = "builddir = \@builddir\@";
$abs_builddir_name = "abs_builddir = \@abs_builddir\@";
# top_builddir is used by libtool. We use master_top_builddir because
......@@ -320,6 +321,7 @@ $top_builddir_name = "top_builddir = \@master_top_builddir\@";
'htmldir' => $htmldir_name,
'docdir' => $docdir_name,
'sysconfdir' => $sysconfdir_name,
'pkgconfigdir' => $pkgconfigdir_name,
);
#InstallDirFromKind maps XXX from install_XXX into the GNU name
......@@ -332,6 +334,7 @@ $top_builddir_name = "top_builddir = \@master_top_builddir\@";
'HTML' => 'htmldir',
'DOC' => 'docdir',
'ETC' => 'sysconfdir',
'PKGCONFIG' => 'pkgconfigdir',
);
# We add the -p switch to install for the libraries because libraries
# that require ranlib may fail if installed without preserving the
......@@ -363,6 +366,8 @@ $top_builddir_name = "top_builddir = \@master_top_builddir\@";
'includedir' => 'prefix',
'exec_prefix' => 'prefix',
'sysconfdir' => 'prefix',
'exec_prefix' => 'prefix',
'pkgconfigdir'=> 'libdir exec_prefix prefix',
);
# etc.
#
......@@ -2532,6 +2537,12 @@ sub TargetClean {
# RecursiveOp uses extra_dirs,subdirs; the "1" forces it to check
# for the existence of the Makefile
&RecursiveOp( "distclean", "", 1 );
# Add clean of local libraries
foreach $lib (keys(%extra_libs)) {
print FD "\t-${quietLine}rm -f $lib$newline";
}
# Remove any local files last (in case this file is one of them)
$rmfile = "";
if (!$curdir) { $curdir = ""; }
......
......@@ -100,9 +100,10 @@ OTHER_DIRS = names of other directories *provided* but not used
by all tools. This is used for directories that
contain subdirectories refered to by EXTRA_DIRS
EXTRA_PROGRAMS = names of programs that should *not* be built by default
install_<type> = names of files to install when "make install" is
INSTALL_<type> = names of files to install when "make install" is
invoked. <type> is a directory type, such as BIN, LIB,
or INCLUDE.
OPTINSTALL_<type> = Like INSTALL_<type>, but for files that are optional.
<name>-local = Local addition to a target in the Makefile. For example,
to add to the list of files in the clean target, include
clean-local:
......
optinstall_LIB = mpich2-@DEVICE_NAME@.pc
\ No newline at end of file
optinstall_PKGCONFIG = mpich2-@DEVICE_NAME@.pc
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment