Replace all direct references to perl in Makefiles by $(PERL)

git-svn-id: https://svn.dealii.org/trunk@5702 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/common/Make.rules b/deal.II/common/Make.rules
index a9d64294685f30825674ecb6d32d682137189ad9..2c2533f0f20e05d55ce7e314ff98017cc1ea63c6 100644 (file)
--- a/deal.II/common/Make.rules
+++ b/deal.II/common/Make.rules
@@ -33,6 +33,6 @@ all-cc-files = $(shell echo *.cc)
 Makefile.depend: $(all-cc-files)
        @echo =====Dependencies== Makefile.depend
        @$(CXX) $(flags) $^ -M > $@
-       @perl -pi~ -e 's/(^[^.]+)\.o:/\1.o \1.g.o:/;' $@
+       @$(PERL) -pi~ -e 's/(^[^.]+)\.o:/\1.o \1.g.o:/;' $@
 
 include Makefile.depend

diff --git a/deal.II/contrib/hsl/Makefile b/deal.II/contrib/hsl/Makefile
index 730e20862e7e8ff2508b9dd9c9c977a54525ee77..8d29a1208d85e31e416eff7080d86d0705b3299d 100644 (file)
--- a/deal.II/contrib/hsl/Makefile
+++ b/deal.II/contrib/hsl/Makefile
@@ -60,7 +60,7 @@ Makefile.dep: $(f-files) Makefile
        @echo ============================ Remaking Makefile
        @(if test "x$(f-files)" != "x" ; then \
            for i in source/*.f ; do \
-            echo $$i | perl -pi -e 's#source/(.*)\.f#\$$(LIBDIR)/contrib/hsl/\1.o:source/\1.f#;' ;\
+            echo $$i | $(PERL) -pi -e 's#source/(.*)\.f#\$$(LIBDIR)/contrib/hsl/\1.o:source/\1.f#;' ;\
            done ; \
           fi) \
                > Makefile.dep

diff --git a/deal.II/contrib/utilities/Makefile.in b/deal.II/contrib/utilities/Makefile.in
index 2a7bf3a21d3dbeb31a2bbeaeaab784188c89fd46..eac4814f59682f19959a70b580451356fe59b965 100644 (file)
--- a/deal.II/contrib/utilities/Makefile.in
+++ b/deal.II/contrib/utilities/Makefile.in
@@ -53,6 +53,6 @@ interpolation.exe: interpolation.o $(libraries)
 Makefile.depend: $(shell echo *.cc)
        @echo =====Dependencies== $@
        @$(CXX) $(CXXFLAGS.g) $^ -M > $@
-       @perl -pi -e 's/(^[^.]+)\.o:/\1.o \1.g.o:/;' $@
+       @$(PERL) -pi -e 's/(^[^.]+)\.o:/\1.o \1.g.o:/;' $@
 
 include Makefile.depend

diff --git a/deal.II/doc/auto/kdoc/Makefile.in b/deal.II/doc/auto/kdoc/Makefile.in
index e7d0998f612bdec9b2b2abee435107ca15fa7f88..5a4da1d6e4893afefeb5514eede349e4eb1d42b1 100644 (file)
--- a/deal.II/doc/auto/kdoc/Makefile.in
+++ b/deal.II/doc/auto/kdoc/Makefile.in
@@ -95,19 +95,19 @@ multigrid-html-files: kdoc-installed $(kdoc.multigrid)
 %-fix-files:
        for htmlfile in $(subst -fix-files,,$@)/*html ; do \
            echo "Fixing include paths in $$htmlfile..." ; \
-           perl -pi -e 's,(#include &lt;<A HREF=\"[^\"]+\">)$D/?[^/]+/include/,$$1,g; \
+           $(PERL) -pi -e 's,(#include &lt;<A HREF=\"[^\"]+\">)$D/?[^/]+/include/,$$1,g; \
                          s,<h1>Source: $D/?(.*)</h1>,<h1>Source: $$1</h1>,g;' "$$htmlfile" ;\
        done
        for htmlfile in $(subst -fix-files,,$@)/header-list.html $(subst -fix-files,,$@)/all-globals.html ; do \
            echo "Fixing include paths in special file $$htmlfile..." ; \
            case "$$htmlfile" in \
              *header-list*) \
-                       perl -pi -e 's,<TH>$D/?[^/]+/include/(.*?) - $D/?[^/]+/include/(.*?)</TH>,<TH>$$1 - $$2</TH>,g; \
+                       $(PERL) -pi -e 's,<TH>$D/?[^/]+/include/(.*?) - $D/?[^/]+/include/(.*?)</TH>,<TH>$$1 - $$2</TH>,g; \
                                     s,(<A HREF=\"[^\"]+\">)$D/?[^/]+/include/,$$1,g;' \
                                "$$htmlfile" ;\
                        ;; \
              *all-globals*) \
-                       perl -pi -e 's,(<A HREF=\"[^\"]+\">)$D/?[^/]+/include/,$$1,g;' \
+                       $(PERL) -pi -e 's,(<A HREF=\"[^\"]+\">)$D/?[^/]+/include/,$$1,g;' \
                                "$$htmlfile" ;\
                        ;; \
              *) \

diff --git a/deal.II/doc/development/Makefile.large b/deal.II/doc/development/Makefile.large
index c1c7a3df29bb54dee9031cd99f94fed274926826..c922bc1c833a7303b2853c53d5f06a7e21cb6202 100644 (file)
--- a/deal.II/doc/development/Makefile.large
+++ b/deal.II/doc/development/Makefile.large
@@ -137,8 +137,8 @@ clean-data:
 # `lib/'.
 lib/Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) Makefile
        @echo =====waves=======$(deal_II_dimension)d================== Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(cc-files) \
-        | perl -p -e 's!^lib/g?o/(.*):!lib/$(deal_II_dimension)d/$$1:!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(cc-files) \
+        | $(PERL) -p -e 's!^lib/g?o/(.*):!lib/$(deal_II_dimension)d/$$1:!g;' \
                > lib/Makefile.dep
 
 include lib/Makefile.dep

diff --git a/deal.II/doc/development/Makefile.small b/deal.II/doc/development/Makefile.small
index 33919d51ca2f78035fc16bacc306e817fe81939c..ef55e923977ebec4a84515475dee173738cc569e 100644 (file)
--- a/deal.II/doc/development/Makefile.small
+++ b/deal.II/doc/development/Makefile.small
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h     \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/Makefile b/deal.II/doc/tutorial/chapter-2.step-by-step/Makefile
index 3a357bf9af0b8e079b05614d843c59ff784db60f..96aa7bbca3a1903797968e33d5ee13859d998bb7 100644 (file)
--- a/deal.II/doc/tutorial/chapter-2.step-by-step/Makefile
+++ b/deal.II/doc/tutorial/chapter-2.step-by-step/Makefile
@@ -15,13 +15,13 @@ all: $(example-htmls)
 $(example-htmls):
        @echo ================== Assembling $@
        @TOC=`cat $D/examples/$(@:.html=)/$(@:.html=.cc) \
-         | perl program2toc \
-         | perl -pi -e 's/\"/\\\"/g;'` ; \
+         | $(PERL) program2toc \
+         | $(PERL) -pi -e 's/\"/\\\"/g;'` ; \
         cat head.html \
-         | perl -pi -e '$$step="$@";                     \
+         | $(PERL) -pi -e '$$step="$@";                     \
                          $$step=~s/step-(\d+).html/$$1/g; \
                          s/step xxx/step $$step/g;'       \
-         | perl -pi -e "s!TOC!$$TOC!g;" \
+         | $(PERL) -pi -e "s!TOC!$$TOC!g;" \
          > $@
        @cat $(@:.html=.data/intro.html) >> $@
        @cat $D/examples/$(@:.html=)/$(@:.html=.cc) \
@@ -65,7 +65,7 @@ $(example-sgmls):
 step-by-step.sgml: $(example-sgmls)
        @echo ================== Concating $@
        @cat step-by-step.header.sgml          \
-             | perl -pi -e 's/TODAY/$(shell date)/;'   \
+             | $(PERL) -pi -e 's/TODAY/$(shell date)/;'   \
              > $@
        @for step in $(example-names) ; do      \
             echo "<sect1><title>$$step</title>" >> $@ ; \

diff --git a/deal.II/doc/tutorial/chapter-3.laplace/code/Makefile b/deal.II/doc/tutorial/chapter-3.laplace/code/Makefile
index 7fbd4d59066110d47a9fde1dcaf806b959e63217..637ab68aef010dfdf44a1417edcf50a108a6adef 100644 (file)
--- a/deal.II/doc/tutorial/chapter-3.laplace/code/Makefile
+++ b/deal.II/doc/tutorial/chapter-3.laplace/code/Makefile
@@ -144,7 +144,7 @@ clean:
 #rather for libnumerics.a(tria.o)
 Makefile.dep: $(cc-files) $(h-files) $(lib-h-files)
        @echo ============================ Remaking Makefile
-       @perl $(root)/deal.II/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \
+       @$(PERL) $(root)/deal.II/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \
                > Makefile.dep
 
 

diff --git a/deal.II/examples/step-1/Makefile b/deal.II/examples/step-1/Makefile
index 9761232d00e38fa52a00183cec56a6573f39404c..dc63e104412fdaf32c0de1692576f200ee0a4242 100644 (file)
--- a/deal.II/examples/step-1/Makefile
+++ b/deal.II/examples/step-1/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-10/Makefile b/deal.II/examples/step-10/Makefile
index dd721e4f44f97e3f0fadae19487142959709112a..4333ecdcb8b7ff4e02cea4f2d454d2566e95b251 100644 (file)
--- a/deal.II/examples/step-10/Makefile
+++ b/deal.II/examples/step-10/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-11/Makefile b/deal.II/examples/step-11/Makefile
index c02ef0f148efae8f641362e505aadb2afadd4f50..2780e004977524ac0e3a81b80576d25b417f120a 100644 (file)
--- a/deal.II/examples/step-11/Makefile
+++ b/deal.II/examples/step-11/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-12/Makefile b/deal.II/examples/step-12/Makefile
index c02ef0f148efae8f641362e505aadb2afadd4f50..2780e004977524ac0e3a81b80576d25b417f120a 100644 (file)
--- a/deal.II/examples/step-12/Makefile
+++ b/deal.II/examples/step-12/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-13/Makefile b/deal.II/examples/step-13/Makefile
index c02ef0f148efae8f641362e505aadb2afadd4f50..2780e004977524ac0e3a81b80576d25b417f120a 100644 (file)
--- a/deal.II/examples/step-13/Makefile
+++ b/deal.II/examples/step-13/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-2/Makefile b/deal.II/examples/step-2/Makefile
index 41b6eb1e896a98d180023f46f6fe5cd4a924a900..0cd69ee81c6edaa89d2781d9bb47340ab7cdfac3 100644 (file)
--- a/deal.II/examples/step-2/Makefile
+++ b/deal.II/examples/step-2/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-3/Makefile b/deal.II/examples/step-3/Makefile
index c02ef0f148efae8f641362e505aadb2afadd4f50..2780e004977524ac0e3a81b80576d25b417f120a 100644 (file)
--- a/deal.II/examples/step-3/Makefile
+++ b/deal.II/examples/step-3/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-4/Makefile b/deal.II/examples/step-4/Makefile
index 270d71c47dba5b4bb131617bf03197db55908cf8..30673b07b8e9487ba07adcdfed58406324fa13c0 100644 (file)
--- a/deal.II/examples/step-4/Makefile
+++ b/deal.II/examples/step-4/Makefile
@@ -150,8 +150,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-5/Makefile b/deal.II/examples/step-5/Makefile
index c02ef0f148efae8f641362e505aadb2afadd4f50..2780e004977524ac0e3a81b80576d25b417f120a 100644 (file)
--- a/deal.II/examples/step-5/Makefile
+++ b/deal.II/examples/step-5/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-6/Makefile b/deal.II/examples/step-6/Makefile
index c02ef0f148efae8f641362e505aadb2afadd4f50..2780e004977524ac0e3a81b80576d25b417f120a 100644 (file)
--- a/deal.II/examples/step-6/Makefile
+++ b/deal.II/examples/step-6/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-7/Makefile b/deal.II/examples/step-7/Makefile
index 6360bcca20162bd174d67d4692443f3fc47b97f3..84a2408be8e20691975331b8e9a6d31376fe62cd 100644 (file)
--- a/deal.II/examples/step-7/Makefile
+++ b/deal.II/examples/step-7/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-8/Makefile b/deal.II/examples/step-8/Makefile
index c02ef0f148efae8f641362e505aadb2afadd4f50..2780e004977524ac0e3a81b80576d25b417f120a 100644 (file)
--- a/deal.II/examples/step-8/Makefile
+++ b/deal.II/examples/step-8/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include

diff --git a/deal.II/examples/step-9/Makefile b/deal.II/examples/step-9/Makefile
index c02ef0f148efae8f641362e505aadb2afadd4f50..2780e004977524ac0e3a81b80576d25b417f120a 100644 (file)
--- a/deal.II/examples/step-9/Makefile
+++ b/deal.II/examples/step-9/Makefile
@@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \
                            $(include-path-lac)/lac/*.h      \
                            $(include-path-deal2)/*/*.h)
        @echo ============================ Remaking Makefile
-       @perl $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
-               | perl -pi -e 's!lib/g?o/!!g;' \
+       @$(PERL) $D/common/scripts/make_dependencies.pl  $(INCLUDE) $(target).cc \
+               | $(PERL) -pi -e 's!lib/g?o/!!g;' \
                > Makefile.dep
 
 # To make the dependencies known to `make', we finally have to include