typo

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

diff --git a/Makefile.PL b/Makefile.PL
index 794a2ed477dd08c8b938246c42b09ae11eff6896..4b2e2854485de200f9ccebabd6b80686795f5f97 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -35,8 +35,8 @@ scripts=ikiwiki-update-wikilist ikiwiki-makerepo
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
        chmod +x $@
 
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
        chmod +x $@
 

-ikiwiki.setup: ikiwiki.out
-       PERL5LIB=. HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -dumpsetup ikiwiki.setup
+ikiwiki.setup:
+       HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -dumpsetup ikiwiki.setup

 
 extra_build: $(outprogs) ikiwiki.setup docwiki
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
 
 extra_build: $(outprogs) ikiwiki.setup docwiki
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man


@@ -49,14 +49,18 @@ extra_build: $(outprogs) ikiwiki.setup docwiki
        sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
        rm -f ikiwiki.spec.bkp
        
        sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
        rm -f ikiwiki.spec.bkp
        

-docwiki: ikiwiki.out
-       PERL5LIB=. $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -setup docwiki.setup -refresh
+docwiki:
+       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh

 
 extra_clean:
 
 extra_clean:

-       PERL5LIB=. $(PERL) -I. $(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
 
        rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
        $(MAKE) -C po clean
 

+# Joey uses this before committing.
+myclean: clean
+       git checkout po ikiwiki.spec
+

 underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
 underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \


@@ -71,10 +75,24 @@ underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive
        for file in doc/ikiwiki/directive/*; do \
                if [ -f "$$file" ]; then \
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive
        for file in doc/ikiwiki/directive/*; do \
                if [ -f "$$file" ]; then \

+                       cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \

                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
                fi \
        done
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
                fi \
        done

-       
+
+       # Themes have their style.css appended to the normal one.
+       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 $$file) >> $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \
+                       elif [ -f "$$file" ]; then \
+                               cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \
+                               install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
+                       fi \
+               done; \
+       done
+

 extra_install: underlay_install
        # Install example sites.
        for dir in `cd doc/examples; find . -type d ! -regex '.*\.svn.*'`; do \
 extra_install: underlay_install
        # Install example sites.
        for dir in `cd doc/examples; find . -type d ! -regex '.*\.svn.*'`; do \