From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_PASS autolearn=ham version=3.2.5 From: Mike Frysinger To: kbd@lists.altlinux.org Date: Sun, 2 Dec 2012 16:16:44 -0500 Message-Id: <1354483006-17453-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.12.4 Subject: [kbd] [PATCH 1/3] fix various vlock build errors X-BeenThere: kbd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Linux console tools development discussion List-Id: Linux console tools development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Dec 2012 21:16:53 -0000 Archived-At: List-Archive: The current code assumes the build is done in-tree and sets up -I paths according to that. As such, out-of-tree builds fail. Fix AM_CPPFLAGS to work in either case. No build system should hardcode optimization/pipe flags. So delete that AM_CFLAGS line and let the configure/user build settings work. Finally, EXTRA_DIST should not be conditional. Otherwise, the configure flags will impact the tarball created by `make distcheck`. Signed-off-by: Mike Frysinger --- src/vlock/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vlock/Makefile.am b/src/vlock/Makefile.am index 3f074f4..fa9f5be 100644 --- a/src/vlock/Makefile.am +++ b/src/vlock/Makefile.am @@ -1,9 +1,9 @@ -AM_CPPFLAGS = -I.. -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" -AM_CFLAGS = -pipe -O2 +AM_CPPFLAGS = -I$(srcdir)/.. -I$(builddir)/.. -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" + +EXTRA_DIST = README.vlock if VLOCK bin_PROGRAMS = vlock -EXTRA_DIST = README.vlock endif vlock_SOURCES = \ -- 1.7.12.4