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
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
|
From 0bed080cd873dc42100bcfcb4ea2764445c0485d Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sat, 25 Apr 2020 11:16:01 +0100
Subject: [PATCH 1/2] Use docdir the standard way so that it can be overridden
with --docdir
The default is determined by the 4th argument (PACKAGE_TARBALL) to
AC_INIT, which itself defaults to the 1st argument (PACKAGE_NAME). That
would currently name the docdir `advancemame` rather than the desired
`advance`. Rather than change the 1st argument, set the 4th argument so
that only the docdir is affected. These variables/macros are not really
used elsewhere anyway.
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,6 +5,7 @@
# configuration edit the Makefile.usr file and NOT this file.
#
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
VERSION=@PACKAGE_VERSION@
prefix=@prefix@
datadir=@datadir@
--- a/Makefile.usr
+++ b/Makefile.usr
@@ -238,8 +238,8 @@ srcdir=.
datadir=${prefix}/share
sysconfdir=${prefix}/etc
bindir=${prefix}/bin
-mandir=${prefix}/man
-docdir=${prefix}/share/doc
+mandir=${datadir}/man
+docdir=${datadir}/doc/advance
#############################################################################
# Extra configuration common for ./configure and manual
--- a/advance/advance.mak
+++ b/advance/advance.mak
@@ -374,12 +374,11 @@ CONF_SRC = \
# Install
pkgdir = $(datadir)/advance
-pkgdocdir = $(docdir)/advance
install-dirs:
-$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)
- -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir)
+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(docdir)
-$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom
-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample
@@ -464,15 +463,15 @@ uninstall-bin:
install-doc: $(INSTALL_DOCFILES)
ifdef INSTALL_DOCFILES
@for i in $(INSTALL_DOCFILES); do \
- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir)"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \
+ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
done
endif
uninstall-doc:
ifdef INSTALL_DOCFILES
@for i in $(notdir $(INSTALL_DOCFILES)); do \
- rm -f $(DESTDIR)$(pkgdocdir)/$$i; \
+ rm -f $(DESTDIR)$(docdir)/$$i; \
done
endif
@@ -501,7 +500,7 @@ uninstall-dirs:
-rmdir $(DESTDIR)$(pkgdir)/snap/ti99_4a
-rmdir $(DESTDIR)$(pkgdir)/snap
-rmdir $(DESTDIR)$(pkgdir)
- -rmdir $(DESTDIR)$(pkgdocdir)
+ -rmdir $(DESTDIR)$(docdir)
install: install-dirs install-bin install-data install-doc install-man
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
dnl Get version number from git
m4_define([git_revision], m4_esyscmd_s([./autover.sh]))
-AC_INIT([advancemame],[git_revision],[],[],[http://www.advancemame.it])
+AC_INIT([advancemame],[git_revision],[],[advance],[http://www.advancemame.it])
AC_CONFIG_SRCDIR([advance/advance.mak])
AC_CONFIG_HEADERS([advance/lib/config.h:advance/lib/config.hin])
AC_CANONICAL_HOST
@@ -1233,8 +1233,6 @@ AC_SUBST([CONF_LIB_JEVENT],[$ac_lib_jevent])
dnl Final
AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag])
-AC_SUBST([mandir],['${prefix}/man'])
-AC_SUBST([docdir],['${prefix}/doc'])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
--
2.51.0
From 0baa0af9e3daf8aed0accd8b5311255249c55dba Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sat, 25 Apr 2020 11:52:13 +0100
Subject: [PATCH 2/2] Install *.html files to a separate htmldir rather than
docdir
Autoconf already sets up htmldir for you. It defaults to the same as
docdir but some distributions set it differently.
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,6 +15,7 @@ exec_prefix=@exec_prefix@
bindir=@bindir@
mandir=@mandir@
docdir=@docdir@
+htmldir=@htmldir@
CONF_SYSTEM=@CONF_SYSTEM@
CONF_HOST=@CONF_HOST@
CONF_BUILD=@CONF_BUILD@
--- a/Makefile.usr
+++ b/Makefile.usr
@@ -240,6 +240,7 @@ sysconfdir=${prefix}/etc
bindir=${prefix}/bin
mandir=${datadir}/man
docdir=${datadir}/doc/advance
+htmldir=${docdir}
#############################################################################
# Extra configuration common for ./configure and manual
--- a/advance/advance.mak
+++ b/advance/advance.mak
@@ -153,7 +153,7 @@ endif
endif
INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.txt,$(wildcard $(srcdir)/doc/*.d)))
-INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.html,$(wildcard $(srcdir)/doc/*.d)))
+INSTALL_HTMLFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.html,$(wildcard $(srcdir)/doc/*.d)))
WEB_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.hh,$(wildcard $(srcdir)/doc/*.d)))
############################################################################
@@ -163,7 +163,7 @@ ifdef ADV_ALL
all_override: $(ADV_ALL)
endif
-all: $(OBJ_DIRS) $(INSTALL_BINFILES) $(INSTALL_DOCFILES) $(INSTALL_MANFILES)
+all: $(OBJ_DIRS) $(INSTALL_BINFILES) $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) $(INSTALL_MANFILES)
mame: $(OBJ) $(OBJ)/advmame$(EXE)
mess: $(MESSOBJ) $(MESSOBJ)/advmess$(EXE)
emu: mame mess
@@ -183,7 +183,7 @@ web: $(WEB_DOCFILES)
# Ensure that the doc target is always created also if a doc directory exists
.PHONY: doc
-doc: $(INSTALL_DOCFILES)
+doc: $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES)
############################################################################
# Source
@@ -379,6 +379,7 @@ install-dirs:
-$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)
-$(INSTALL_DATA_DIR) $(DESTDIR)$(docdir)
+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(htmldir)
-$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom
-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample
@@ -460,13 +461,19 @@ uninstall-bin:
rm -f $(DESTDIR)$(bindir)/$$i; \
done
-install-doc: $(INSTALL_DOCFILES)
+install-doc: $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES)
ifdef INSTALL_DOCFILES
@for i in $(INSTALL_DOCFILES); do \
echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
done
endif
+ifdef INSTALL_HTMLFILES
+ @for i in $(INSTALL_HTMLFILES); do \
+ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)"; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir); \
+ done
+endif
uninstall-doc:
ifdef INSTALL_DOCFILES
@@ -474,6 +481,11 @@ ifdef INSTALL_DOCFILES
rm -f $(DESTDIR)$(docdir)/$$i; \
done
endif
+ifdef INSTALL_HTMLFILES
+ @for i in $(notdir $(INSTALL_HTMLFILES)); do \
+ rm -f $(DESTDIR)$(htmldir)/$$i; \
+ done
+endif
install-man: $(INSTALL_MANFILES)
ifdef INSTALL_MANFILES
@@ -500,6 +512,7 @@ uninstall-dirs:
-rmdir $(DESTDIR)$(pkgdir)/snap/ti99_4a
-rmdir $(DESTDIR)$(pkgdir)/snap
-rmdir $(DESTDIR)$(pkgdir)
+ -rmdir $(DESTDIR)$(htmldir)
-rmdir $(DESTDIR)$(docdir)
install: install-dirs install-bin install-data install-doc install-man
--
2.51.0
|
