(no commit message)

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

diff --git a/Makefile.PL b/Makefile.PL
index 907ff30c9159c4b316dc31029d16693e60435b4e..b63ee73975ae57b4034229be8c78936a3b03e6b5 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -61,7 +61,7 @@ extra_build: perl_shebangs $(outprogs) ikiwiki.setup docwiki sysconfdir
 docwiki:
        $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in --setup docwiki.setup --refresh
 
 docwiki:
        $(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 \
 ifneq "$(PERL)" "/usr/bin/perl"
        set -e; \
        for file in $(shebang_scripts); do \


@@ -87,16 +87,19 @@ sysconfdir:
 extra_clean: perl_shebangs_clean
        $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in --setup docwiki.setup --clean
        rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
 extra_clean: perl_shebangs_clean
        $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in --setup docwiki.setup --clean
        rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc

+       rm -fr t/tmp t/manual/*/git/ t/manual/*/html/ t/tinyblog/.ikiwiki/ t/tinypodcast/.ikiwiki/

        $(MAKE) -C po clean
 
        $(MAKE) -C po clean
 

-# Joey uses this before committing.
-myclean: clean
+reset-generated:

        git checkout po ikiwiki.spec
 
        git checkout po ikiwiki.spec
 

+# Joey uses this before committing.
+myclean: clean reset-generated
+

 underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        set -e; \
 underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        set -e; \

-       for dir in `cd underlays && $(FIND) . -follow -type d`; do \
+       for dir in `$(FIND) underlays -follow -mindepth 1 -type d | $(SED) -e 's|^underlays/||'`; 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 \
                        if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null; then \
                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 \
                        if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null; then \


@@ -137,11 +140,11 @@ underlay_install:
 extra_install: underlay_install
        # Install example sites.
        set -e; \
 extra_install: underlay_install
        # Install example sites.
        set -e; \

-       for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*discussion.*'`; do \
+       for dir in `$(FIND) doc/examples -type d ! -regex '.*discussion.*' | $(SED) -ne 's|^doc/examples/||p'`; do \

                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
        done
        set -e; \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
        done
        set -e; \

-       for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \
+       for file in `$(FIND) doc/examples -type f ! -regex '.*discussion.*' | $(SED) -ne 's|^doc/examples/||p'`; do \

                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; \
                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; \


@@ -203,6 +206,9 @@ coverage:
        cover -delete
        $(MAKE) test PERL5OPT=-MDevel::Cover PERL5LIB=. TEST_FILES="$(filter-out t/git.t t/mercurial.t,$(wildcard t/*.t))"
        cover
        cover -delete
        $(MAKE) test PERL5OPT=-MDevel::Cover PERL5LIB=. TEST_FILES="$(filter-out t/git.t t/mercurial.t,$(wildcard t/*.t))"
        cover

+
+git-dist:
+       git archive --format=tar --prefix=IkiWiki-$(VER)/ HEAD | xz -c > IkiWiki-$(VER).tar.xz

 }
 }
 
 }
 }