quilt-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Quilt-dev] [PATCH 1/4] Fix Makefile when QUILT_PATCHES_PREFIX isn't set


From: Jean Delvare
Subject: [Quilt-dev] [PATCH 1/4] Fix Makefile when QUILT_PATCHES_PREFIX isn't set
Date: Tue, 2 May 2017 13:55:25 +0200

Unsetting QUILT_PATCHES_PREFIX in test/test.quiltrc would trigger a
syntax error on "make check":

/bin/bash: -c: line 3: syntax error near unexpected token `;'
/bin/bash: -c: line 3: `;                                                       
\'
Makefile:410: recipe for target 'test/.add-filename-check.ok' failed
make: *** [test/.add-filename-check.ok] Error 1

Signed-off-by: Jean Delvare <address@hidden>
---
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- quilt.orig/Makefile.in      2017-05-02 08:55:16.911291978 +0200
+++ quilt/Makefile.in   2017-05-02 08:55:37.035525556 +0200
@@ -398,7 +398,7 @@ test/.depend : Makefile $(TESTS)
          > $@
 
 ifneq ($(shell . $(QUILTRC) ;  echo $$QUILT_PATCHES_PREFIX),)
-CHECK_ENV := P=patches/; _P=../patches/; export P _P
+CHECK_ENV := P=patches/; _P=../patches/; export P _P;
 endif
 
 # Each tests dependencies are stored in test/.depend
@@ -410,7 +410,7 @@ endif
        @LANG=C; LC_ALL=C;                                              \
        export LANG LC_ALL;                                             \
        unset POSIXLY_CORRECT;                                          \
-       $(CHECK_ENV);                                                   \
+       $(CHECK_ENV)                                                    \
        cd $(@D);                                                       \
        ./run -q $(<F)
        @touch $@


-- 
Jean Delvare
SUSE L3 Support



reply via email to

[Prev in Thread] Current Thread [Next in Thread]