Mercurial > mxe-octave

comparison src/fontconfig-1.patch @ 3505:5a35cc5310da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fontconfig: use LN_S for ln -s commands * src/fontconfig-1.patch: changes in conf.f/Makefile to us LN_S.
author John Donoghue <john.donoghue@ieee.org>
date Thu, 06 Feb 2014 20:00:52 -0500
parents 0a00857f8b9c
children 472c440a678b
comparison
equal deleted inserted replaced
3504:f8e5b89bb3e3 3505:5a35cc5310da
8 - $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir) 8 - $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir)
9 + $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) #$(DESTDIR)$(fc_cachedir) 9 + $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) #$(DESTDIR)$(fc_cachedir)
10 if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \ 10 if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \
11 echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \ 11 echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
12 mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \ 12 mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \
13 diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.am fontconfig-2.11.0/conf.d/Makefile.am
14 --- fontconfig-2.11.0.orig/conf.d/Makefile.am 2014-02-06 16:51:06 -0500
15 +++ fontconfig-2.11.0/conf.d/Makefile.am 2014-02-06 16:53:20 -0500
16 @@ -88,9 +88,9 @@
17 @(echo cd $(DESTDIR)$(configdir); \
18 cd $(DESTDIR)$(configdir); \
19 for i in $(CONF_LINKS); do \
20 - echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \
21 + echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .; \
22 $(RM) $$i; \
23 - ln -s $(templatedir)/$$i .; \
24 + $(LN_S) $(templatedir)/$$i .; \
25 done)
26 uninstall-local:
27 @(echo cd $(DESTDIR)$(configdir); \
28 diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.in fontconfig-2.11.0/conf.d/Makefile.in
29 --- fontconfig-2.11.0.orig/conf.d/Makefile.in 2014-02-06 16:51:06 -0500
30 +++ fontconfig-2.11.0/conf.d/Makefile.in 2014-02-06 16:53:51 -0500
31 @@ -632,9 +632,9 @@
32 @(echo cd $(DESTDIR)$(configdir); \
33 cd $(DESTDIR)$(configdir); \
34 for i in $(CONF_LINKS); do \
35 - echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \
36 + echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .; \
37 $(RM) $$i; \
38 - ln -s $(templatedir)/$$i .; \
39 + $(LN_S) $(templatedir)/$$i .; \
40 done)
41 uninstall-local:
42 @(echo cd $(DESTDIR)$(configdir); \
43
44 diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.am fontconfig-2.11.0/conf.d/Makefile.am
45 --- fontconfig-2.11.0.orig/conf.d/Makefile.am 2014-02-06 19:41:13 -0500
46 +++ fontconfig-2.11.0/conf.d/Makefile.am 2014-02-06 19:54:52 -0500
47 @@ -88,9 +88,9 @@
48 @(echo cd $(DESTDIR)$(configdir); \
49 cd $(DESTDIR)$(configdir); \
50 for i in $(CONF_LINKS); do \
51 - echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .; \
52 + echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \
53 $(RM) $$i; \
54 - $(LN_S) $(templatedir)/$$i .; \
55 + $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \
56 done)
57 uninstall-local:
58 @(echo cd $(DESTDIR)$(configdir); \
59 diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.in fontconfig-2.11.0/conf.d/Makefile.in
60 --- fontconfig-2.11.0.orig/conf.d/Makefile.in 2014-02-06 19:41:13 -0500
61 +++ fontconfig-2.11.0/conf.d/Makefile.in 2014-02-06 19:54:00 -0500
62 @@ -632,9 +632,9 @@
63 @(echo cd $(DESTDIR)$(configdir); \
64 cd $(DESTDIR)$(configdir); \
65 for i in $(CONF_LINKS); do \
66 - echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .; \
67 + echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \
68 $(RM) $$i; \
69 - $(LN_S) $(templatedir)/$$i .; \
70 + $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \
71 done)
72 uninstall-local:
73 @(echo cd $(DESTDIR)$(configdir); \