| Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame^] | 1 | From eced8077b57946fe0b723e7c6c510e8f344ce89b Mon Sep 17 00:00:00 2001 |
| 2 | From: Serge Hallyn <serge@hallyn.com> |
| 3 | Date: Fri, 23 Jul 2021 17:51:13 -0500 |
| 4 | Subject: [PATCH] Fix out of tree builds with respect to libsubid includes |
| 5 | |
| 6 | There's a better way to do this, and I hope to clean that up, |
| 7 | but this fixes out of tree builds for me right now. |
| 8 | |
| 9 | Closes #386 |
| 10 | |
| 11 | Signed-off-by: Serge Hallyn <serge@hallyn.com> |
| 12 | Upstream-Status: Backport [https://github.com/shadow-maint/shadow/commit/537b8cd90be7b47b45c45cfd27765ef85eb0ebf1] |
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 14 | --- |
| 15 | lib/Makefile.am | 2 ++ |
| 16 | libmisc/Makefile.am | 2 +- |
| 17 | libsubid/Makefile.am | 4 ++-- |
| 18 | src/Makefile.am | 6 ++++++ |
| 19 | 4 files changed, 11 insertions(+), 3 deletions(-) |
| 20 | |
| 21 | diff --git a/lib/Makefile.am b/lib/Makefile.am |
| 22 | index ecf3ee25..5ac2e111 100644 |
| 23 | --- a/lib/Makefile.am |
| 24 | +++ b/lib/Makefile.am |
| 25 | @@ -10,6 +10,8 @@ if HAVE_VENDORDIR |
| 26 | libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\" |
| 27 | endif |
| 28 | |
| 29 | +libshadow_la_CPPFLAGS += -I$(top_srcdir) |
| 30 | + |
| 31 | libshadow_la_SOURCES = \ |
| 32 | commonio.c \ |
| 33 | commonio.h \ |
| 34 | diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am |
| 35 | index 9766a7ec..9f237e0d 100644 |
| 36 | --- a/libmisc/Makefile.am |
| 37 | +++ b/libmisc/Makefile.am |
| 38 | @@ -1,7 +1,7 @@ |
| 39 | |
| 40 | EXTRA_DIST = .indent.pro xgetXXbyYY.c |
| 41 | |
| 42 | -AM_CPPFLAGS = -I$(top_srcdir)/lib $(ECONF_CPPFLAGS) |
| 43 | +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(ECONF_CPPFLAGS) |
| 44 | |
| 45 | noinst_LTLIBRARIES = libmisc.la |
| 46 | |
| 47 | diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am |
| 48 | index 189165b0..cdc41fe6 100644 |
| 49 | --- a/libsubid/Makefile.am |
| 50 | +++ b/libsubid/Makefile.am |
| 51 | @@ -19,8 +19,8 @@ MISCLIBS = \ |
| 52 | $(LIBTCB) |
| 53 | |
| 54 | libsubid_la_LIBADD = \ |
| 55 | - $(top_srcdir)/lib/libshadow.la \ |
| 56 | - $(top_srcdir)/libmisc/libmisc.la \ |
| 57 | + $(top_builddir)/lib/libshadow.la \ |
| 58 | + $(top_builddir)/libmisc/libmisc.la \ |
| 59 | $(MISCLIBS) -ldl |
| 60 | |
| 61 | AM_CPPFLAGS = \ |
| 62 | diff --git a/src/Makefile.am b/src/Makefile.am |
| 63 | index 35027013..7c1a3491 100644 |
| 64 | --- a/src/Makefile.am |
| 65 | +++ b/src/Makefile.am |
| 66 | @@ -10,6 +10,7 @@ sgidperms = 2755 |
| 67 | AM_CPPFLAGS = \ |
| 68 | -I${top_srcdir}/lib \ |
| 69 | -I$(top_srcdir)/libmisc \ |
| 70 | + -I$(top_srcdir) \ |
| 71 | -DLOCALEDIR=\"$(datadir)/locale\" |
| 72 | |
| 73 | # XXX why are login and su in /bin anyway (other than for |
| 74 | @@ -183,6 +184,7 @@ list_subid_ranges_LDADD = \ |
| 75 | list_subid_ranges_CPPFLAGS = \ |
| 76 | -I$(top_srcdir)/lib \ |
| 77 | -I$(top_srcdir)/libmisc \ |
| 78 | + -I$(top_srcdir) \ |
| 79 | -I$(top_srcdir)/libsubid |
| 80 | |
| 81 | get_subid_owners_LDADD = \ |
| 82 | @@ -194,11 +196,13 @@ get_subid_owners_LDADD = \ |
| 83 | get_subid_owners_CPPFLAGS = \ |
| 84 | -I$(top_srcdir)/lib \ |
| 85 | -I$(top_srcdir)/libmisc \ |
| 86 | + -I$(top_srcdir) \ |
| 87 | -I$(top_srcdir)/libsubid |
| 88 | |
| 89 | new_subid_range_CPPFLAGS = \ |
| 90 | -I$(top_srcdir)/lib \ |
| 91 | -I$(top_srcdir)/libmisc \ |
| 92 | + -I$(top_srcdir) \ |
| 93 | -I$(top_srcdir)/libsubid |
| 94 | |
| 95 | new_subid_range_LDADD = \ |
| 96 | @@ -210,6 +214,7 @@ new_subid_range_LDADD = \ |
| 97 | free_subid_range_CPPFLAGS = \ |
| 98 | -I$(top_srcdir)/lib \ |
| 99 | -I$(top_srcdir)/libmisc \ |
| 100 | + -I$(top_srcdir) \ |
| 101 | -I$(top_srcdir)/libsubid |
| 102 | |
| 103 | free_subid_range_LDADD = \ |
| 104 | @@ -220,6 +225,7 @@ free_subid_range_LDADD = \ |
| 105 | |
| 106 | check_subid_range_CPPFLAGS = \ |
| 107 | -I$(top_srcdir)/lib \ |
| 108 | + -I$(top_srcdir) \ |
| 109 | -I$(top_srcdir)/libmisc |
| 110 | |
| 111 | check_subid_range_LDADD = \ |
| 112 | -- |
| 113 | 2.31.1 |
| 114 | |