Then individual package is detached from the main source tree, running
'make dist' in this detached sub-tree will fail, it is because
../gen_chlog.sh script will not be found. Fix it, make ChangeLog
generation on dist-hook optional.
Signed-off-by: Sasha Khapyorsky <[EMAIL PROTECTED]>
---
infiniband-diags/Makefile.am | 5 +++--
libibcommon/Makefile.am | 5 +++--
libibmad/Makefile.am | 5 +++--
libibumad/Makefile.am | 5 +++--
opensm/Makefile.am | 5 +++--
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/infiniband-diags/Makefile.am b/infiniband-diags/Makefile.am
index edff06c..e1b4d58 100644
--- a/infiniband-diags/Makefile.am
+++ b/infiniband-diags/Makefile.am
@@ -95,8 +95,9 @@ EXTRA_DIST = scripts include infiniband-diags.spec.in
infiniband-diags.spec \
$(man_MANS) autogen.sh
dist-hook:
- test -x ../$(top_srcdir)/gen_chlog.sh \
- && ../$(top_srcdir)/gen_chlog.sh $(PACKAGE) >
$(distdir)/ChangeLog
+ if [ -x $(top_srcdir)/../gen_chlog.sh ] ; then \
+ $(top_srcdir)/../gen_chlog.sh $(PACKAGE) > $(distdir)/ChangeLog
; \
+ fi
# install this to a default location.
install-data-hook:
diff --git a/libibcommon/Makefile.am b/libibcommon/Makefile.am
index af60035..75889f4 100644
--- a/libibcommon/Makefile.am
+++ b/libibcommon/Makefile.am
@@ -27,5 +27,6 @@ EXTRA_DIST = $(srcdir)/include/infiniband/common.h \
$(srcdir)/src/libibcommon.map libibcommon.ver autogen.sh
dist-hook:
- test -x ../$(top_srcdir)/gen_chlog.sh \
- && ../$(top_srcdir)/gen_chlog.sh $(PACKAGE) >
$(distdir)/ChangeLog
+ if [ -x $(top_srcdir)/../gen_chlog.sh ] ; then \
+ $(top_srcdir)/../gen_chlog.sh $(PACKAGE) > $(distdir)/ChangeLog
; \
+ fi
diff --git a/libibmad/Makefile.am b/libibmad/Makefile.am
index a350d50..beae1a4 100644
--- a/libibmad/Makefile.am
+++ b/libibmad/Makefile.am
@@ -29,5 +29,6 @@ EXTRA_DIST = $(srcdir)/include/infiniband/mad.h
libibmad.spec.in libibmad.spec \
$(srcdir)/src/libibmad.map libibmad.ver autogen.sh
dist-hook:
- test -x ../$(top_srcdir)/gen_chlog.sh \
- && ../$(top_srcdir)/gen_chlog.sh $(PACKAGE) >
$(distdir)/ChangeLog
+ if [ -x $(top_srcdir)/../gen_chlog.sh ] ; then \
+ $(top_srcdir)/../gen_chlog.sh $(PACKAGE) > $(distdir)/ChangeLog
; \
+ fi
diff --git a/libibumad/Makefile.am b/libibumad/Makefile.am
index 7674654..49c8b11 100644
--- a/libibumad/Makefile.am
+++ b/libibumad/Makefile.am
@@ -41,8 +41,9 @@ EXTRA_DIST = $(srcdir)/include/infiniband/umad.h \
$(man_MANS) autogen.sh
dist-hook:
- test -x ../$(top_srcdir)/gen_chlog.sh \
- && ../$(top_srcdir)/gen_chlog.sh $(PACKAGE) >
$(distdir)/ChangeLog
+ if [ -x $(top_srcdir)/../gen_chlog.sh ] ; then \
+ $(top_srcdir)/../gen_chlog.sh $(PACKAGE) > $(distdir)/ChangeLog
; \
+ fi
install-data-hook:
cd $(DESTDIR)$(mandir)/man3 && \
diff --git a/opensm/Makefile.am b/opensm/Makefile.am
index 70de2d7..0c817ae 100644
--- a/opensm/Makefile.am
+++ b/opensm/Makefile.am
@@ -28,5 +28,6 @@ various_scripts = $(wildcard scripts/*)
EXTRA_DIST = autogen.sh opensm.spec $(various_scripts) $(man_MANS)
dist-hook: $(EXTRA_DIST)
- test -x ../$(top_srcdir)/gen_chlog.sh \
- && ../$(top_srcdir)/gen_chlog.sh $(PACKAGE) >
$(distdir)/ChangeLog
+ if [ -x $(top_srcdir)/../gen_chlog.sh ] ; then \
+ $(top_srcdir)/../gen_chlog.sh $(PACKAGE) > $(distdir)/ChangeLog
; \
+ fi
--
1.5.4.rc2.38.gd6da3
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
