$NetBSD: patch-aa,v 1.14 2009/11/16 22:51:14 schmonz Exp $ --- Makefile.PL.orig 2009-11-13 15:06:57.000000000 -0500 +++ Makefile.PL @@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\ # Additional configurable path variables. W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin +CONFIGDIR?=/etc/ikiwiki +MANDIR?=$(PREFIX)/share/man tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi) extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi) @@ -60,7 +62,7 @@ underlay_install: for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \ - cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ + cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ done; \ done @@ -79,7 +81,7 @@ extra_install: underlay_install install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \ done for file in `cd doc/examples; find . -type f ! -regex '.*\.svn.*'`; do \ - cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \ + 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; \ done @@ -98,15 +100,15 @@ extra_install: underlay_install install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ done - install -d $(DESTDIR)$(PREFIX)/share/man/man1 - install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1 - install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-makerepo.1 - install -m 644 ikiwiki-transition.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-transition.1 - install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1 - install -m 644 ikiwiki-calendar.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-calendar.1 + install -d $(DESTDIR)$(MANDIR)/man1 + install -m 644 ikiwiki.man $(DESTDIR)$(MANDIR)/man1/ikiwiki.1 + install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-makerepo.1 + install -m 644 ikiwiki-transition.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-transition.1 + install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-update-wikilist.1 + install -m 644 ikiwiki-calendar.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-calendar.1 - install -d $(DESTDIR)$(PREFIX)/share/man/man8 - install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8 + install -d $(DESTDIR)$(MANDIR)/man8 + install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(MANDIR)/man8/ikiwiki-mass-rebuild.8 install -d $(DESTDIR)$(PREFIX)/sbin install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin @@ -122,10 +124,10 @@ extra_install: underlay_install # These might fail if a regular user is installing into a home # directory. - -install -d $(DESTDIR)/etc/ikiwiki - -install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki - -install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki - -install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki + -install -d $(DESTDIR)/$(CONFIGDIR) + -install -m 0644 wikilist $(DESTDIR)/$(CONFIGDIR) + -install -m 0644 auto.setup $(DESTDIR)/$(CONFIGDIR) + -install -m 0644 auto-blog.setup $(DESTDIR)/$(CONFIGDIR) } }