[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Quilt-dev] [PATCH] Makefile.in: fix patch-wrapper checks
From: |
Kent R. Spillner |
Subject: |
[Quilt-dev] [PATCH] Makefile.in: fix patch-wrapper checks |
Date: |
Mon, 2 Jun 2014 17:16:43 -0500 |
293c4ddb added checks to Makefile.in to disable the patch-wrapper test
when the configure script is not invoked with the --with-patch-wrapper
argument. Those checks assumed that PATCH_WRAPPER will always be empty
unless --with-patch-wrapper was used. However, PATCH_WRAPPER will be
set to "no" when the configure script is invoked with the
--without-patch-wrapper argument. Add nested ifneq check to handle
this case as well.
Signed-off-by: Kent R. Spillner <address@hidden>
---
Makefile.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Makefile.in b/Makefile.in
index d03591a..f59fd00 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -122,8 +122,10 @@ GIT_DESC := $(shell ./git-desc | sed -e 's:^v::')
TESTS := $(filter-out test/patch-wrapper.test,$(wildcard test/*.test))
ifneq ($(PATCH_WRAPPER),)
+ifneq ($(PATCH_WRAPPER), no)
TESTS += test/patch-wrapper.test
endif
+endif
DIRT += test/.depend $(wildcard test/.*.ok)
# Settings for running the uninstalled version of quilt in the source tree:
@@ -316,10 +318,12 @@ install-main :: scripts
$(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns \
$(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts
ifneq ($(PATCH_WRAPPER),)
+ifneq ($(PATCH_WRAPPER), no)
$(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper
$(INSTALL) -m 755 bin/patch-wrapper \
$(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch
endif
+endif
$(INSTALL) -d $(BUILD_ROOT)$(docdir)/
$(INSTALL) -m 644 doc/README \
--
1.9.3
- [Quilt-dev] [PATCH] Makefile.in: fix patch-wrapper checks,
Kent R. Spillner <=