1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
From 50ca24b59585e2d90e0517041824d62b5b9a3807 Mon Sep 17 00:00:00 2001
From: Solomon Choina <shlomochoina@gmail.com>
Date: Wed, 13 Sep 2017 11:58:59 -0400
Subject: [PATCH] change conf.d slightly to fit infinality
---
conf.d/Makefile.am | 43 +------------------------------------------
conf.d/Makefile.in | 31 +++----------------------------
2 files changed, 4 insertions(+), 70 deletions(-)
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index fd50a5d..a85ad74 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -21,30 +21,9 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-BUILT_SOURCES = README
-DOC_SOURCES = README.in
DOC_FILES = $(DOC_SOURCES:.in=)
-CONF_LINKS = \
- 10-hinting-$(PREFERRED_HINTING).conf \
- 10-scale-bitmap-fonts.conf \
- 20-unhint-small-vera.conf \
- 30-urw-aliases.conf \
- 30-metric-aliases.conf \
- 40-nonlatin.conf \
- 45-generic.conf \
- 45-latin.conf \
- 49-sansserif.conf \
- 50-user.conf \
- 51-local.conf \
- 60-generic.conf \
- 60-latin.conf \
- 65-fonts-persian.conf \
- 65-nonlatin.conf \
- 69-unifont.conf \
- 80-delicious.conf \
- 90-synthetic.conf
-
+CONF_LINKS =
EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
CLEANFILES = $(DOC_FILES)
@@ -89,24 +68,4 @@ template_DATA = \
80-delicious.conf \
90-synthetic.conf
-README: $(srcdir)/README.in
- sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
-
-install-data-hook:
- mkdir -p $(DESTDIR)$(configdir)
- @(echo cd $(DESTDIR)$(configdir); \
- cd $(DESTDIR)$(configdir); \
- for i in $(CONF_LINKS); do \
- echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \
- $(RM) $$i; \
- ln -s $(templatedir)/$$i .; \
- done)
-uninstall-local:
- @(echo cd $(DESTDIR)$(configdir); \
- cd $(DESTDIR)$(configdir); \
- for i in $(CONF_LINKS); do \
- echo $(RM) $$i; \
- $(RM) $$i; \
- done)
-
-include $(top_srcdir)/git.mk
diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in
index d626007..40c0a57 100644
--- a/conf.d/Makefile.in
+++ b/conf.d/Makefile.in
@@ -173,7 +173,7 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(configdir)" "$(DESTDIR)$(templatedir)"
+am__installdirs = "$(DESTDIR)$(templatedir)"
DATA = $(config_DATA) $(template_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in README
@@ -346,29 +346,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-BUILT_SOURCES = README
-DOC_SOURCES = README.in
DOC_FILES = $(DOC_SOURCES:.in=)
-CONF_LINKS = \
- 10-hinting-$(PREFERRED_HINTING).conf \
- 10-scale-bitmap-fonts.conf \
- 20-unhint-small-vera.conf \
- 30-urw-aliases.conf \
- 30-metric-aliases.conf \
- 40-nonlatin.conf \
- 45-generic.conf \
- 45-latin.conf \
- 49-sansserif.conf \
- 50-user.conf \
- 51-local.conf \
- 60-generic.conf \
- 60-latin.conf \
- 65-fonts-persian.conf \
- 65-nonlatin.conf \
- 69-unifont.conf \
- 80-delicious.conf \
- 90-synthetic.conf
-
+CONF_LINKS =
EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
CLEANFILES = $(DOC_FILES)
configdir = $(CONFIGDIR)
@@ -534,7 +513,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(configdir)" "$(DESTDIR)$(templatedir)"; do \
+ for dir in "$(DESTDIR)$(templatedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -656,10 +635,6 @@ uninstall-am: uninstall-configDATA uninstall-local \
.PRECIOUS: Makefile
-
-README: $(srcdir)/README.in
- sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
-
install-data-hook:
mkdir -p $(DESTDIR)$(configdir)
@(echo cd $(DESTDIR)$(configdir); \
--
2.14.1
|