dlm: master - Substitute LIBDIR into pkg-config files
by David Teigland
Gitweb: http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=bddc503b1e1e56a...
Commit: bddc503b1e1e56afcbcc02edded74f56b5157bb4
Parent: c4d060213081fcf9bd47bfc90374a2ffcefd7020
Author: Ferenc W��gner <wferi(a)niif.hu>
AuthorDate: Sat Aug 29 22:27:07 2015 +0200
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Jan 5 11:11:19 2016 -0600
Substitute LIBDIR into pkg-config files
Signed-off-by: Ferenc W��gner <wferi(a)niif.hu>
---
libdlm/Makefile | 4 ++--
libdlm/libdlm.pc.in | 2 +-
libdlm/libdlm_lt.pc.in | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libdlm/Makefile b/libdlm/Makefile
index e7cdb17..336c22e 100644
--- a/libdlm/Makefile
+++ b/libdlm/Makefile
@@ -102,10 +102,10 @@ $(LLT_TARGET): $(LLT_O)
ln -sf $(LLT_TARGET) $(LLT_SMAJOR)
$(LIB_PC): $(LIB_PCIN)
- cat $(LIB_PCIN) | sed -e 's#@PREFIX@#$(PREFIX)#g' > $@
+ cat $(LIB_PCIN) | sed -e 's#@PREFIX@#$(PREFIX)#g;s#@LIBDIR@#$(LIBDIR)#g' > $@
$(LLT_PC): $(LLT_PCIN)
- cat $(LIB_PCIN) | sed -e 's#@PREFIX@#$(PREFIX)#g' > $@
+ cat $(LIB_PCIN) | sed -e 's#@PREFIX@#$(PREFIX)#g;s#@LIBDIR@#$(LIBDIR)#g' > $@
clean:
rm -f *.o *.so *.so.* *.a *.pc
diff --git a/libdlm/libdlm.pc.in b/libdlm/libdlm.pc.in
index 3a51bfc..b5652ea 100644
--- a/libdlm/libdlm.pc.in
+++ b/libdlm/libdlm.pc.in
@@ -1,7 +1,7 @@
prefix=@PREFIX@
exec_prefix=${prefix}
includedir=${prefix}/include
-libdir=${exec_prefix}/lib64
+libdir=@LIBDIR@
Name: libdlm
Description: The dlm library
diff --git a/libdlm/libdlm_lt.pc.in b/libdlm/libdlm_lt.pc.in
index 36d3974..5b8eaee 100644
--- a/libdlm/libdlm_lt.pc.in
+++ b/libdlm/libdlm_lt.pc.in
@@ -1,7 +1,7 @@
prefix=@PREFIX@
exec_prefix=${prefix}
includedir=${prefix}/include
-libdir=${exec_prefix}/lib64
+libdir=@LIBDIR@
Name: libdlm_lt
Description: The non-threaded dlm library
8 years, 4 months
dlm: master - Pass down command line to sub-makes
by David Teigland
Gitweb: http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=c4d060213081fcf...
Commit: c4d060213081fcf9bd47bfc90374a2ffcefd7020
Parent: 2811cdf4890fb244e4a7e22a5d39493362761962
Author: Ferenc W��gner <wferi(a)niif.hu>
AuthorDate: Sat Aug 29 22:17:38 2015 +0200
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Jan 5 11:11:19 2016 -0600
Pass down command line to sub-makes
At the same time, reduce repetitions in the main Makefile.
Signed-off-by: Ferenc W��gner <wferi(a)niif.hu>
---
Makefile | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index 0b6ec6a..dd29bce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,2 @@
-all:
- make -C libdlm $@
- make -C dlm_controld $@
- make -C dlm_tool $@
-
-install:
- make -C libdlm $@
- make -C dlm_controld $@
- make -C dlm_tool $@
-
-clean:
- make -C libdlm $@
- make -C dlm_controld $@
- make -C dlm_tool $@
-
+all install clean: %:
+ for d in libdlm dlm_controld dlm_tool fence; do $(MAKE) -C $$d $@; done
8 years, 4 months
dlm: master - release 4.0.3
by David Teigland
Gitweb: http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=2811cdf4890fb24...
Commit: 2811cdf4890fb244e4a7e22a5d39493362761962
Parent: b5b06ccf564cd339b91526c13be1dd86d06c1a93
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Jan 5 10:53:45 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Jan 5 10:53:45 2016 -0600
release 4.0.3
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
include/version.cf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/version.cf b/include/version.cf
index bdef7a7..27b4f4d 100644
--- a/include/version.cf
+++ b/include/version.cf
@@ -1,6 +1,6 @@
#ifndef _RELEASE_VERSION_CF_
#define _RELEASE_VERSION_CF_
-#define RELEASE_VERSION "4.0.2"
+#define RELEASE_VERSION "4.0.3"
#endif
8 years, 4 months