diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-03-16 15:09:39 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-03-16 15:09:39 +0000 |
| commit | c8ff3c90c5ec263bc2e25780a326b94dcfe11223 (patch) | |
| tree | 276fa12b87f65dfc56b88fee071817c23e362a31 | |
| parent | 855e697fa2bcd3a1873c2eb0ce050b83869cf996 (diff) | |
Fix previous: README goes in /etc/fonts/conf.d
while here be more coherent in make variable expansion.
| -rw-r--r-- | lib/fontconfig/conf.d/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/fontconfig/conf.d/Makefile b/lib/fontconfig/conf.d/Makefile index 96c47fa8d..b4e87b0da 100644 --- a/lib/fontconfig/conf.d/Makefile +++ b/lib/fontconfig/conf.d/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2013/03/16 14:56:53 matthieu Exp $ +# $OpenBSD: Makefile,v 1.6 2013/03/16 15:09:38 matthieu Exp $ FONTCONFIG = ${.CURDIR}/../../../dist/fontconfig CONFIGDIR = /etc/fonts/conf.d @@ -28,7 +28,6 @@ CONF_LINKS = \ 90-synthetic.conf AVAIL_FILES = \ - README \ 10-autohint.conf \ 10-no-sub-pixel.conf \ 10-scale-bitmap-fonts.conf \ @@ -64,16 +63,17 @@ AVAIL_FILES = \ all cleandir: install: - @for i in $(AVAIL_FILES); do \ - echo ${INSTALL_DATA} $$i $(DESTDIR)${CONFAVAILDIR}; \ - ${INSTALL_DATA} ${FONTCONFIG}/conf.d/$$i $(DESTDIR)${CONFAVAILDIR}; \ + @for i in ${AVAIL_FILES}; do \ + echo ${INSTALL_DATA} $$i ${DESTDIR}${CONFAVAILDIR}; \ + ${INSTALL_DATA} ${FONTCONFIG}/conf.d/$$i ${DESTDIR}${CONFAVAILDIR}; \ done - @(echo cd $(DESTDIR)$(CONFIGDIR); \ - cd $(DESTDIR)$(CONFIGDIR); \ - for i in $(CONF_LINKS); do \ - echo rm $$i";" ln -s $(CONFAVAILDIR)/$$i .; \ + ${INSTALL_DATA} ${FONTCONFIG}/conf.d/README ${DESTDIR}/${CONFIGDIR} + @(echo cd ${DESTDIR}${CONFIGDIR}; \ + cd ${DESTDIR}${CONFIGDIR}; \ + for i in ${CONF_LINKS}; do \ + echo rm $$i";" ln -s ${CONFAVAILDIR}/$$i .; \ rm -f $$i; \ - ln -s $(CONFAVAILDIR)/$$i .; \ + ln -s ${CONFAVAILDIR}/$$i .; \ done) NOOBJ= |