]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
The new bison version now also includes the uppercased builddir in a
authorStefan Fritsch <sf@apache.org>
Sat, 15 Jun 2013 21:19:04 +0000 (21:19 +0000)
committerStefan Fritsch <sf@apache.org>
Sat, 15 Jun 2013 21:19:04 +0000 (21:19 +0000)
preprocessor symbol. Remove it to avoid spurious diffs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493421 13f79535-47bb-0310-9956-ffa450edef68

server/Makefile.in

index 5ff3ee7c794d579263195243c55722c9185231cc..98043799007596e69d20f7b5f316cae4a23ea8c0 100644 (file)
@@ -101,8 +101,10 @@ util_expr_scan.c util_expr_parse.c util_expr_parse.h: util_expr_scan.l util_expr
            -o $(builddir)/util_expr_parse.c $(srcdir)/util_expr_parse.y
        flex -Pap_expr_yy -o $(builddir)/util_expr_scan.c $(srcdir)/util_expr_scan.l
        set -e ; \
+       builddir_uc=$$(echo "$(builddir)"|tr a-z/.- A-Z___ ) ; \
        for f in util_expr_scan.c util_expr_parse.c util_expr_parse.h ; do \
-               sed -e "s|\"$(builddir)/|\"|g" < $(builddir)/$$f > \
+               sed -e "s|\"$(builddir)/|\"|g" -e "s|$$builddir_uc||g" \
+                       < $(builddir)/$$f > \
                        $(builddir)/$$f.$$$$ && \
                mv $(builddir)/$$f.$$$$ $(builddir)/$$f ; \
        done