[Darshan-commits] [Git][darshan/darshan][master] 2 commits: bug fix to pkgconfig path for darshan-util

[Philip Carns]

Philip Carns pushed to branch master at darshan / darshan


Commits:
b102e65f by Philip Carns at 2020-02-24T21:27:52Z
bug fix to pkgconfig path for darshan-util

- reported by Matthew Curry

- - - - -
68b06d4a by Philip Carns at 2020-02-24T21:27:52Z
Merge branch 'carns/bugfix-pkgconfig-destdir' into 'master'

bug fix to pkgconfig path for darshan-util

See merge request darshan/darshan!36
- - - - -


2 changed files:

- ChangeLog
- darshan-util/Makefile.in


Changes:

=====================================
ChangeLog
=====================================
@@ -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


=====================================
darshan-util/Makefile.in
=====================================
@@ -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::



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/compare/9c769b2cf415ea024d56df27526cb6d75e9199cc...68b06d4ab098f4070bd279fae8a0e62e71d71d6a

-- 
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/compare/9c769b2cf415ea024d56df27526cb6d75e9199cc...68b06d4ab098f4070bd279fae8a0e62e71d71d6a
You're receiving this email because of your account on xgitlab.cels.anl.gov.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20200224/23ae984d/attachment-0001.html>