update

[git.ikiwiki.info.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 5b0eb747199eb25bba81230238c743438eed6746..6f1724697a938537cd224dcd869bd17d8a7fb05b 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -44,7 +44,7 @@ PROBABLE_INST_LIB=$(shell \\
        chmod +x $@
 
 ikiwiki.setup:
-       HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -dumpsetup ikiwiki.setup
+       HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in --dumpsetup ikiwiki.setup
 
 extra_build: perl_shebangs $(outprogs) ikiwiki.setup docwiki sysconfdir
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
@@ -59,10 +59,11 @@ extra_build: perl_shebangs $(outprogs) ikiwiki.setup docwiki sysconfdir
        rm -f ikiwiki.spec.bkp
        
 docwiki:
-       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh
+       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in --setup docwiki.setup --refresh
 
-perl_shebangs:
+perl_shebangs: pm_to_blib
 ifneq "$(PERL)" "/usr/bin/perl"
+       set -e; \
        for file in $(shebang_scripts); do \
                $(PERL) -pe "s|^#!/usr/bin/perl\b|#!$(PERL)| if 1" < $$file > "$$file.new"; \
                [ -x $$file ] && chmod +x "$$file.new"; \
@@ -72,6 +73,7 @@ endif
 
 perl_shebangs_clean:
 ifneq "$(PERL)" "/usr/bin/perl"
+       set -e; \
        for file in $(shebang_scripts); do \
                $(PERL) -pe "s|^#!$(PERL)\b|#!/usr/bin/perl| if 1" < $$file > "$$file.new"; \
                [ -x $$file ] && chmod +x "$$file.new"; \
@@ -83,7 +85,7 @@ sysconfdir:
        $(PERL) -pi -e "s|\"/etc/ikiwiki|\"$(SYSCONFDIR)|g" $(sysconfdir_scripts)
        
 extra_clean: perl_shebangs_clean
-       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean
+       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in --setup docwiki.setup --clean
        rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
        $(MAKE) -C po clean
 
@@ -93,49 +95,59 @@ myclean: clean
 
 underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
+       set -e; \
        for dir in `cd underlays && $(FIND) . -follow -type d`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name jquery.js ! -name jquery-ui.css ! -name jquery-ui.js ! -name jquery.tmpl.js`; do \
-                       cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
-                       install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+                       if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null; then \
+                               install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+                       fi; \
                done; \
        done
 
        # The directive docs become their own special underlay.
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive
+       set -e; \
        for file in doc/ikiwiki/directive/*; do \
                if [ -f "$$file" ]; then \
-                       cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \
-                       install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
+                       if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null; then \
+                               install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
+                       fi; \
                fi \
        done
 
        # Themes have their base.css (if present) and then
        # style.css appended to the normal one.
+       set -e; \
        for theme in themes/*; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme; \
                for file in $$theme/*; do \
                        if echo "$$file" | grep -q style.css; then \
-                               (cat doc/style.css; cat $$theme/base.css 2>/dev/null; cat $$file) > $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \
+                               (cat doc/style.css; cat $$theme/base.css 2>/dev/null || :; cat $$file) > $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \
                        elif echo "$$file" | grep -q base.css; then \
                                :; \
                        elif [ -f "$$file" ]; then \
-                               cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \
-                               install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
+                               if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null; then \
+                                       install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
+                               fi; \
                        fi \
                done; \
        done
 
 extra_install: underlay_install
        # Install example sites.
+       set -e; \
        for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*discussion.*'`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
        done
+       set -e; \
        for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \
-               cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \
-               install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
+               if ! cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null; then \
+                       install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
+               fi; \
        done
 
+       set -e; \
        for dir in `$(FIND) templates -follow -type d`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                for file in `$(FIND) $$dir -follow -maxdepth 1 -type f`; do \
@@ -144,9 +156,11 @@ extra_install: underlay_install
        done
        
        install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
+       set -e; \
        for file in `$(FIND) plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* -name \*.py`; do \
                install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done
+       set -e; \
        for file in `$(FIND) plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \
                install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done
@@ -169,6 +183,7 @@ extra_install: underlay_install
        install ikiwiki-w3m.cgi $(DESTDIR)$(W3M_CGI_BIN)
 
        install -d $(DESTDIR)$(PREFIX)/bin
+       set -e; \
        for prog in $(outprogs) $(scripts); do \
                install $$prog $(DESTDIR)$(PREFIX)/bin/$$(echo $$prog | $(SED) 's/\.out//'); \
        done