Codebase list ibutils / 816caf4
Set ACLOCAL_AMFLAGS = -I config To support running autoreconf with the usual `-f -i` parameters, set `ACLOCAL_AMFLAGS` to add `-I config`. Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com> Benjamin Drung 3 years ago
3 changed file(s) with 107 addition(s) and 3 deletion(s). Raw diff Collapse all Expand all
0 From 8dfe38d2a453158fc0c51d870778ba9e113a3352 Mon Sep 17 00:00:00 2001
1 From: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2 Date: Wed, 11 Nov 2020 14:41:27 +0100
3 Subject: Set ACLOCAL_AMFLAGS = -I config
4
5 To support running autoreconf with the usual `-f -i` parameters, set
6 `ACLOCAL_AMFLAGS` to add `-I config`.
7
8 Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
9 ---
10 Makefile.am | 1 +
11 ibdiag/Makefile.am | 1 +
12 ibdiag/src/Makefile.am | 2 ++
13 ibdm/Makefile.am | 1 +
14 ibdm/src/Makefile.am | 2 ++
15 ibis/Makefile.am | 1 +
16 ibmgtsim/Makefile.am | 1 +
17 7 files changed, 9 insertions(+)
18
19 diff --git a/Makefile.am b/Makefile.am
20 index cb13dbd..7a13001 100644
21 --- a/Makefile.am
22 +++ b/Makefile.am
23 @@ -43,6 +43,7 @@ DIST_SUBDIRS = ibis ibdm ibdiag $(IBMGTSIMDIR)
24 # this will control the update of the files in order
25 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
26
27 +ACLOCAL_AMFLAGS = -I config
28 ACLOCAL = aclocal -I $(ac_aux_dir)
29
30 EXTRA_DIST = ibutils.spec.in ibmgtsim
31 diff --git a/ibdiag/Makefile.am b/ibdiag/Makefile.am
32 index 7dffd57..7c5891d 100644
33 --- a/ibdiag/Makefile.am
34 +++ b/ibdiag/Makefile.am
35 @@ -38,4 +38,5 @@ SUBDIRS = src doc
36 # this will control the update of the files in order
37 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
38
39 +ACLOCAL_AMFLAGS = -I config
40 ACLOCAL = aclocal -I $(ac_aux_dir)
41 diff --git a/ibdiag/src/Makefile.am b/ibdiag/src/Makefile.am
42 index f39b0ea..a01b8cd 100644
43 --- a/ibdiag/src/Makefile.am
44 +++ b/ibdiag/src/Makefile.am
45 @@ -30,6 +30,8 @@
46 # SOFTWARE.
47 #--
48
49 +ACLOCAL_AMFLAGS = -I config
50 +
51 bin_SCRIPTS = ibdiagnet ibdiagpath ibdiagui git_version.tcl
52 EXTRA_DIST = ibdebug_if.tcl ibdebug.tcl \
53 ibdiagnet.in ibdiagnet.pkg ibdiagnet.tcl \
54 diff --git a/ibdm/Makefile.am b/ibdm/Makefile.am
55 index 7a155b9..5936ba2 100644
56 --- a/ibdm/Makefile.am
57 +++ b/ibdm/Makefile.am
58 @@ -38,6 +38,7 @@ SUBDIRS = ibdm src Clusters ibnl doc scripts
59 # this will control the update of the files in order
60 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
61
62 +ACLOCAL_AMFLAGS = -I config
63 ACLOCAL = aclocal -I $(ac_aux_dir)
64
65 # Support cleanup of swig wrappers
66 diff --git a/ibdm/src/Makefile.am b/ibdm/src/Makefile.am
67 index 5564542..d2a6c4e 100644
68 --- a/ibdm/src/Makefile.am
69 +++ b/ibdm/src/Makefile.am
70 @@ -34,6 +34,8 @@
71
72 # MAINTAINERCLEANFILES = Makefile.in common.h stamp-common
73
74 +ACLOCAL_AMFLAGS = -I config
75 +
76 # INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(TCL_CPPFLAGS)
77 pkginclude_HEADERS = ibsysapi.h
78
79 diff --git a/ibis/Makefile.am b/ibis/Makefile.am
80 index 6a75322..be67b6d 100644
81 --- a/ibis/Makefile.am
82 +++ b/ibis/Makefile.am
83 @@ -38,6 +38,7 @@ SUBDIRS = src tests doc
84 # this will control the update of the files in order
85 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
86
87 +ACLOCAL_AMFLAGS = -I config
88 ACLOCAL = aclocal -I $(ac_aux_dir)
89
90 # Support cleanup of swig wrappers
91 diff --git a/ibmgtsim/Makefile.am b/ibmgtsim/Makefile.am
92 index f528213..208293f 100644
93 --- a/ibmgtsim/Makefile.am
94 +++ b/ibmgtsim/Makefile.am
95 @@ -38,6 +38,7 @@ SUBDIRS = src utils tests doc
96 # this will control the update of the files in order
97 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
98
99 +ACLOCAL_AMFLAGS = -I config
100 ACLOCAL = aclocal -I $(ac_aux_dir)
101
102 # Support cleanup of swig wrappers
103 --
104 2.25.1
105
55 makefile_dependencies.patch
66 cross.patch
77 gcc-10.patch
8 Set-ACLOCAL_AMFLAGS-I-config.patch
89 Fix-generating-man-pages-in-place.patch
910 Always-update-man-pages-if-needed.patch
1011 ibdmsh-Correct-whatis-entry.patch
22
33 %:
44 dh $@
5
6 override_dh_autoreconf:
7 dh_autoreconf autoreconf -- -f -i -I config
85
96 override_dh_auto_configure:
107 dh_auto_configure -- --with-osm=/usr \