fix non-quilt build

[fs/lustre-release.git] / ldiskfs / ldiskfs / autoMakefile.am

diff --git a/ldiskfs/ldiskfs/autoMakefile.am b/ldiskfs/ldiskfs/autoMakefile.am
index 4fd32d4..7c68d87 100644 (file)
--- a/ldiskfs/ldiskfs/autoMakefile.am
+++ b/ldiskfs/ldiskfs/autoMakefile.am
@@ -35,15 +35,16 @@ sources: $(ext3_sources) $(ext3_headers) $(linux_headers) $(series)
        mkdir -p linux-stage/fs/ext3 linux-stage/include/linux
        cp $(ext3_sources) $(ext3_headers) $(ext3_extra) linux-stage/fs/ext3
        cp $(linux_headers) linux-stage/include/linux
        mkdir -p linux-stage/fs/ext3 linux-stage/include/linux
        cp $(ext3_sources) $(ext3_headers) $(ext3_extra) linux-stage/fs/ext3
        cp $(linux_headers) linux-stage/include/linux

-       cd linux-stage && quilt push -a -q

 if USE_QUILT
        cd linux-stage && quilt setup -l ../$(series) -d ../$(patches)
        cd linux-stage && quilt push -a -q
 else
 if USE_QUILT
        cd linux-stage && quilt setup -l ../$(series) -d ../$(patches)
        cd linux-stage && quilt push -a -q
 else

+       @echo -n "Applying ext3 patches:"

        @cd linux-stage && for i in $$(<../$(series)) ; do \
        @cd linux-stage && for i in $$(<../$(series)) ; do \

-               echo "patch -p1 < ../$(patches)/$$i" ; \
-               patch -p1 < ../$(patches)/$$i || exit 1 ; \
+               echo -n " $$i" ; \
+               patch -s -p1 < ../$(patches)/$$i || exit 1 ; \

        done
        done

+       @echo

 endif
 
        mkdir linux
 endif
 
        mkdir linux