Commit 68b06d4a authored by Philip Carns's avatar Philip Carns

Merge branch 'carns/bugfix-pkgconfig-destdir' into 'master'

bug fix to pkgconfig path for darshan-util

See merge request !36
parents 9c769b2c b102e65f
......@@ -4,6 +4,8 @@ Darshan Release Change Log
Darshan-3.2.0-pre1
=============
* corrected pkgconfig path for darshan-util when using DESTDIR (reported by
Matthew Curry)
* added support for non-MPI instrumenation to Darshan, using GCC
construct/destructor attributes for bootstrapping rather than
intercepting MPI_Init()/MPI_Finalize(). This mechanism only
......
......@@ -10,7 +10,6 @@ mandir = $(DESTDIR)@mandir@
sbindir = $(DESTDIR)@sbindir@
bindir = $(DESTDIR)@bindir@
libdir = $(DESTDIR)@libdir@
pkgconfigdir = $(DESTDIR)$(libdir)/pkgconfig
DARSHAN_LOG_FORMAT = $(srcdir)/../darshan-log-format.h
DARSHAN_MOD_LOG_FORMATS = $(srcdir)/../darshan-posix-log-format.h \
......@@ -177,7 +176,6 @@ install:: all
install -d $(bindir)
install -d $(libdir)
install -d $(includedir)
install -d $(pkgconfigdir)
install -m 755 darshan-analyzer $(bindir)
install -m 755 darshan-convert $(bindir)
install -m 755 darshan-diff $(bindir)
......@@ -223,7 +221,8 @@ endif
install -m 644 $(srcdir)/darshan-job-summary/lib/Number/Bytes/Human.pm $(libdir)/Number/Bytes
install -d $(datarootdir)
install -m 644 $(srcdir)/darshan-job-summary/share/* $(datarootdir)
install -m 644 maint/darshan-util.pc $(pkgconfigdir)
install -d $(libdir)/pkgconfig
install -m 644 maint/darshan-util.pc $(libdir)/pkgconfig/darshan-util.pc
clean::
......
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